Fix for empty session id