diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 385fdaadac2f5bafbd387235edb4f9dd1a87cf0c..5bb197fc787bb5af10990d7d862bae020368ad67 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -86,7 +86,7 @@ const int LL_ERR_NOERR = 0;
 #endif
 
 #define LL_STATIC_ASSERT(func, msg) static_assert(func, msg)
-#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) static_assert(false, msg)
+#define LL_BAD_TEMPLATE_INSTANTIATION(type, msg) static_assert(sizeof(type) != 0 && false, msg)
 
 
 /** Error Logging Facility