Bug fix - user data null error