Add better support for blocking server exchanges