bug fix for null currentUser