diff --git a/include/EASTL/internal/hashtable.h b/include/EASTL/internal/hashtable.h
index 0e121462..7b286f4d 100644
--- a/include/EASTL/internal/hashtable.h
+++ b/include/EASTL/internal/hashtable.h
@@ -1681,12 +1681,15 @@ namespace eastl
 		for(size_type i = 0; i < n; ++i)
 		{
 			node_type* pNode = pNodeArray[i];
-			while(pNode)
+			if (!pNode)
+				continue;
+			do
 			{
 				node_type* const pTempNode = pNode;
 				pNode = pNode->mpNext;
 				DoFreeNode(pTempNode);
 			}
+			while(pNode);
 			pNodeArray[i] = NULL;
 		}
 	}