[CDAP-772] Addressed code review comments - Fixed error messages and indentation.