fixup! NullRepositorySafeHandle based proposal