Add onHandlerThrowable and remove UnCaughtExceptionHandler

Cleanup