fixed nil return for current_user