CA-129233: Improve error messaging

Signed-off-by: Vineeth Thampi Raveendran <vineeth.thampi@citrix.com>