Fixed exception handling, better prompt commands