Format source code

Change-Id: I42774178479d7dfae2a31d43c1d54372cbfe5936
Improved exception notigfication mechanism

Change-Id: I189e810c94656c0bc7ee1d353ed2d153a3c57c71