error handling corrected
error message corrected