Fix for sessionUserMap being null in some cases