Merge "Replaced try/catch blocks with assertj - apex-pdp"