Proper error messages added.