Bug 21220 - use catch/message

Summary: use catch/message