added user data error checks, final commit