restructuring, check user data and error catch block
restructuring, check user data and error catch block
restructuring, check user data and error catch block