2ec95001ec
This allows objects requiring the singleton for cleanup avoid a null pointer de-reference. fixes #116298 (cherry picked from commit 9655415fc44687702dd366c02a3ae7b28f2061f2)