added mobile number field + fixed error handling