Resource: Clean up exception handling and error messages

Change-Id: Ibd93e8b22bca708ced8ed8c29760fef73a649255
Merge "Resource: Clean up exception handling and error messages"