Better error checking and responses to user for improved UX