Added a few more error checks to the show command.