CONN-587: make sure $userId is not null and give us more information if it is
CONN-587: added Wikia change and additional logging to find cause of CONN-587
CONN-587 try-catch instead of if-else
CONN-587; CR comments addressed
Merge pull request #4507 from Wikia/CONN-587

CONN-587