Added more error message calls

Change-Id: I21b440d934364788e1055d2892cbef048d2e9f16