global error handling

Change-Id: Ic898478157857fc15c91c8fdb30d122acdf5f44b
Merge "global error handling"