Add unautorized exception handling

Change-Id: Ic2dfc3468328cd0558af9574dabf6dc2afafe764