Add error checking and other feedback for the user