AMEC-1750 updated logic to not display anything on error and when there is no data