added checking before going to the next screen
added error message in the prop file