Fix exception handler, add assert, reduce heap usage#4187