Making uncaught exceptions more useful for admin to debug
Actually fixing one argument commands