Updated the Menu and Queries

Updated the menu and queries to try to handle exceptions.