Fixes error messaging

guang-yee mentioned these changes in the original review:
  https://review.openstack.org/49272

Change-Id: I044f54813a35c131b907ea37fb32ecb8c802a711
Merge "Fixes error messaging"