Added fix for exception on getCurrentUser