bogus exception while client shutting down
Merge pull request #2121 from gurbuzali/client-bogus-exception/3.3

bogus exception while client shutting down