fix some exceptions

Change-Id: Iaae7d2dff63ceea1a3f7d36c0feb452931f810d2