SDPIII-120 Changing the error message as suggested
SDPIII-127 Changing the error message as suggested