Exception handing

Change-Id: I33ea67e6473811f225f0b8925a16b3c18cd207e6