us #2242, proper exception handling...

Change-Id: I05db471378602fba846235f4ab9851c352a6e4c2