diff --git a/lib/class.js b/lib/class.js
index 59fd64f..edb9bf5 100644
--- a/lib/class.js
+++ b/lib/class.js
@@ -253,8 +253,8 @@ function createNamedClass( name, def )
     if ( arguments.length > 2 )
     {
         throw Error(
-            "Expecting two arguments for named Class definition; " +
-                arguments.length + " given."
+            "Expecting two arguments for definition of named Class '" + name +
+                "'; " + arguments.length + " given."
         );
     }
 
@@ -268,7 +268,8 @@ function createNamedClass( name, def )
     else if ( typeof def !== 'object' )
     {
         throw TypeError(
-            "Unexpected value for named class definition; object expected"
+            "Unexpected value for definition of named Class '" + name +
+                "'; object expected"
         );
     }
 
diff --git a/test/test-class-name.js b/test/test-class-name.js
index 4d40508..3125e4d 100644
--- a/test/test-class-name.js
+++ b/test/test-class-name.js
@@ -45,15 +45,45 @@ var common = require( './common' ),
             "Class defined with name is returned as a valid class"
         );
     }, Error, "Class accepts name" );
+} )();
 
-    // the second argument must be an object
-    assert.throws( function()
+
+/**
+ * The class definition must be an object, which is equivalent to the class
+ * body
+ */
+( function testNamedClassDefinitionRequiresThatDefinitionBeAnObject()
+{
+    var name = 'Foo';
+
+    try
     {
-        Class( 'Foo', 'Bar' );
-    }, TypeError, "Second argument to named class must be the definition" );
+        Class( name, 'Bar' );
+
+        // if all goes well, we'll never get to this point
+        assert.fail( "Second argument to named class must be the definition" );
+    }
+    catch ( e )
+    {
+        assert.notEqual(
+            e.toString().match( name ),
+            null,
+            "Class definition argument count error string contains class name"
+        );
+    }
+} )();
+
+
+/**
+ * Extraneous arguments likely indicate a misunderstanding of the API
+ */
+( function testNamedClassDefinitionIsStrictOnArgumentCount()
+{
+    var name = 'Foo',
+        args = [ name, {}, 'extra' ]
+    ;
 
     // we should be permitted only two arguments
-    var args = [ 'Foo', {}, 'extra' ];
     try
     {
         Class.apply( null, args );
@@ -66,8 +96,16 @@ var common = require( './common' ),
     }
     catch ( e )
     {
+        var errstr = e.toString();
+
         assert.notEqual(
-            e.toString().match( args.length + ' given' ),
+            errstr.match( name ),
+            null,
+            "Named class error should provide name of class"
+        );
+
+        assert.notEqual(
+            errstr.match( args.length + ' given' ),
             null,
             "Named class error should provide number of given arguments"
         );