More error handling for menu option