issue: 407728 Fix for exception handling to prevent unexpected runtime
exception.

Change-Id: I7d3f07ab234e86add9843e834bd37ed475f71211