Fix exceptions

Change-Id: I89540654563c12f70a18810cd08eeb8a28918f4a