Fix missing support for monitor == null