Refactored the error messages sent back via getStatus

Change-Id: I60a32f6fc77a580105389974e0c415cf90152ffa