Index: trunk/nv/common.hh
===================================================================
--- trunk/nv/common.hh	(revision 79)
+++ trunk/nv/common.hh	(revision 80)
@@ -119,5 +119,5 @@
 #define NV_ASSERT(cond, msg) assert( (cond) && msg )
 #define NV_THROW(eobj, ...) { \
-	NV_LOG( LOG_ERROR, __FILE__ " line " NV_STRINGIZE(__LINE__) " - exception thrown - " #eobj ); \
+	NV_LOG( nv::LOG_ERROR, __FILE__ " line " NV_STRINGIZE(__LINE__) " - exception thrown - " #eobj ); \
   throw eobj( __VA_ARGS__ ); \
 } 
@@ -179,9 +179,13 @@
 {
 #if NV_DEBUG
-	T* p = dynamic_cast<T*>(x);
-	if (p == 0) THROW( std::bad_cast, () );
-	return p;
+    T* p = dynamic_cast<T*>(x);
+    if (p == 0)
+    {
+        NV_THROW( std::bad_cast, "dynamic_cast returned NULL" );
+    }
+
+    return p;
 #else
-	return static_cast<T*>(x);
+    return static_cast<T*>(x);
 #endif
 }
Index: trunk/nv/logging.hh
===================================================================
--- trunk/nv/logging.hh	(revision 79)
+++ trunk/nv/logging.hh	(revision 80)
@@ -23,5 +23,5 @@
     enum log_level
     {
-		LOG_NONE     = 0,
+        LOG_NONE     = 0,
         LOG_FATAL    = 10,
         LOG_CRITICAL = 20,