- Added check for on quit to shutdown the blocking client.