diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 3cdd051ac73c60285612c2b92d90a0981e13e6e5..ffaa464d77a256ff799f27d3ba4e69cd9b4a5600 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -207,7 +207,7 @@ namespace LLError
 		static std::string classname()             { return demangle(typeid(T).name()); }
 		/// classname(some_pointer)
 		template <typename T>
-		static std::string classname(const T* ptr) { return demangle(typeid(*ptr).name()); }
+		static std::string classname(T* const ptr) { return ptr? demangle(typeid(*ptr).name()) : "nullptr"; }
 		/// classname(some_reference)
 		template <typename T>
 		static std::string classname(const T& obj) { return demangle(typeid(obj).name()); }