diff --git a/tableeditor.class.php b/tableeditor.class.php
index 2a11422..890671b 100644
--- a/tableeditor.class.php
+++ b/tableeditor.class.php
@@ -1017,6 +1017,11 @@ class TableEditor
 
 //		print("query[$query]");
 		$q=mysql_query($query);
+		if($q == false) {
+			echo "Sorry, MYSQL query failed: <pre>$query</pre><br />";
+			echo "Error: ".mysql_error(); 
+			exit;
+		}
 
 		//put in some paganation stuff here.
 		$foundrowsq=mysql_query("SELECT FOUND_ROWS() AS f");
@@ -1116,7 +1121,6 @@ class TableEditor
 
 		echo "  (Total: $foundrows)\n";
 		
-		if(mysql_error()){ echo error(mysql_error()); return;}
 		if(mysql_num_rows($q))
 		{
 			echo "<table cellspacing=\"0\" class=\"tableview\">";