Did some error-checking and displaying. Noted a new scenario