removed clientId and userId from message context (will remove session id later); fixed issues which was stopping failing messages from being added to the error queue;