diff --git a/ruamoko/lib/Array.r b/ruamoko/lib/Array.r
index 122c55a7c..e7115d5b4 100644
--- a/ruamoko/lib/Array.r
+++ b/ruamoko/lib/Array.r
@@ -18,13 +18,13 @@
 	return self;
 }
 
-- (void) free
+- (void) dealloc
 {
 	local integer i;
 	for (i = 0; i < count; i++)
-		[array[i] free];
+		[array[i] dealloc];
 	obj_free (array);
-	[super free];
+	[super dealloc];
 }
 
 - (id) getItemAt: (integer) index
diff --git a/ruamoko/lib/Object.r b/ruamoko/lib/Object.r
index 5f710b1e9..7a4114db1 100644
--- a/ruamoko/lib/Object.r
+++ b/ruamoko/lib/Object.r
@@ -233,8 +233,9 @@ BOOL (id object) object_is_meta_class = #0;
 	local IMP msg;
 
 	if (!aSelector || !(msg = obj_msg_lookup (self, aSelector)))
-		return [self error: "invalid selector passed to %s",
-					sel_get_name (_cmd)];
+		[self error: "invalid selector passed to %s: %s",
+					object_get_class_name (self),
+					sel_get_name (aSelector)];
 
 	return msg (self, aSelector);
 }
@@ -244,8 +245,9 @@ BOOL (id object) object_is_meta_class = #0;
 	local IMP msg;
 
 	if (!aSelector || !(msg = obj_msg_lookup (self, aSelector)))
-		return [self error: "invalid selector passed to %s",
-					sel_get_name (_cmd)];
+		[self error: "invalid selector passed to %s: %s",
+					object_get_class_name (self),
+					sel_get_name (aSelector)];
 
 	return msg (self, aSelector, anObject);
 }
@@ -257,7 +259,7 @@ BOOL (id object) object_is_meta_class = #0;
 	local IMP msg;
 
 	if (!aSelector || !(msg = obj_msg_lookup (self, aSelector)))
-		return [self error: "invalid selector passed to %s",
+		[self error: "invalid selector passed to %s",
 					sel_get_name (_cmd)];
 
 	return msg (self, aSelector, anObject, anotherObject);