1) Better error checking