Fixes for exceptions - runtime.