uncaughtException fix