Current return message does not tell the caller why the call failed.

This change adds two additional messages to the returned error message.

Changelog: changed
EE: true
Co-authored-by: Abdul Wadood <awadood@gitlab.com>