More exception handling and other stuff. :mortar_board: