Catch proper exception on MissignArgs error

Change-Id: I3c03440fdbfd065fc53273a37551b8b817c8d97f
Merge "Catch proper exception on MissignArgs error"