added temporary exception handler.