uncaught exception fixed