Manually got Austin's changes

Error checking messages are cleaner