Make comment blocking more graceful (Bug #66392)