Index: trunk/Include/Classes/System/Collections/Generic/Dictionary.ab
===================================================================
--- trunk/Include/Classes/System/Collections/Generic/Dictionary.ab	(revision 365)
+++ trunk/Include/Classes/System/Collections/Generic/Dictionary.ab	(revision 366)
@@ -44,5 +44,6 @@
 		If Object.ReferenceEquals(key, Nothing) Then
 			'Throw ArgumentNullError
-			Exit Sub
+			debug
+			Exit Function
 		End If
 
@@ -59,4 +60,5 @@
 			Next
 		End If
+		debug
 		'KeyNotFoundException
 		Return Nothing
@@ -130,4 +132,6 @@
 
 		a.Add(New Pair(key, value))
+
+		count ++
 	End Sub
 
@@ -138,4 +142,8 @@
 		Next
 	End Sub
+
+	Function Count() As Long
+		Return count
+	End Function
 
 '	Function ContainsKey(key As Key) As Boolean
@@ -162,7 +170,10 @@
 		Dim e = al[0]
 		Dim p = ObjPtr(e) As ULONG_PTR
+
+		count = 0
 	End Sub
 
 	al As ArrayList
+	count As Long
 
 End Class
Index: trunk/Include/Classes/System/String.ab
===================================================================
--- trunk/Include/Classes/System/String.ab	(revision 365)
+++ trunk/Include/Classes/System/String.ab	(revision 366)
@@ -251,5 +251,5 @@
 
 		Override Function Equals(s As Object) As Boolean
-			If This.GetType = s.GetType Then
+			If Object.Equals( This.GetType(), s.GetType() ) Then
 				Return This.Equals(s As String)
 			End If