Adding error output for various conditions for ENG-6075