This allows objects requiring the singleton for cleanup avoid a null pointer de-reference. fixes #116298