diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index 9c64c8b3..ce5282ed 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -3798,9 +3798,16 @@
 					if ( DataTable.ext.afnSortData[sDataType] )
 					{
 						var aData = DataTable.ext.afnSortData[sDataType]( oSettings, iColumn, iVisColumn );
-						for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
+						if ( aData.length === aoData.length )
 						{
-							_fnSetCellData( oSettings, j, iColumn, aData[j] );
+							for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
+							{
+								_fnSetCellData( oSettings, j, iColumn, aData[j] );
+							}
+						}
+						else
+						{
+							_fnLog( oSettings, 0, "Returned data sort array (col "+iColumn+") is the wrong length" );
 						}
 					}
 				}
@@ -4533,7 +4540,7 @@
 				}
 				else
 				{
-					throw sAlert;
+					throw new Error(sAlert);
 				}
 				return;
 			}
diff --git a/media/src/core/core.sort.js b/media/src/core/core.sort.js
index 6a02ab2a..e3606ef0 100644
--- a/media/src/core/core.sort.js
+++ b/media/src/core/core.sort.js
@@ -42,9 +42,16 @@ function _fnSort ( oSettings, bApplyClasses )
 			if ( DataTable.ext.afnSortData[sDataType] )
 			{
 				var aData = DataTable.ext.afnSortData[sDataType]( oSettings, iColumn, iVisColumn );
-				for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
+				if ( aData.length === aoData.length )
 				{
-					_fnSetCellData( oSettings, j, iColumn, aData[j] );
+					for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
+					{
+						_fnSetCellData( oSettings, j, iColumn, aData[j] );
+					}
+				}
+				else
+				{
+					_fnLog( oSettings, 0, "Returned data sort array (col "+iColumn+") is the wrong length" );
 				}
 			}
 		}
diff --git a/media/src/core/core.support.js b/media/src/core/core.support.js
index 8a034640..1d819c8c 100644
--- a/media/src/core/core.support.js
+++ b/media/src/core/core.support.js
@@ -121,7 +121,7 @@ function _fnLog( oSettings, iLevel, sMesg )
 		}
 		else
 		{
-			throw sAlert;
+			throw new Error(sAlert);
 		}
 		return;
 	}