diff --git a/admin/addAppNote.php b/admin/addAppNote.php
index c7ebf3c..bf5c0e5 100644
--- a/admin/addAppNote.php
+++ b/admin/addAppNote.php
@@ -65,13 +65,6 @@ if($_REQUEST['sub'] == "Submit")
         $statusMessage = "<p>Note added into the database</p>\n";
         addmsg($statusMessage,Green);
     }
-    else
-    {
-        // error
-        addmsg($query,red);
-        $statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n";
-        addmsg($statusMessage,red);
-    }
     redirect(apidb_fullurl("appview.php?appId=".$_REQUEST['appId'].$versionLink));
     exit;
 }
diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index 435fc7b..084a6ff 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -262,18 +262,11 @@ if ($_REQUEST['sub'])
                 else
                 {
                     //error
-                    $statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n";
-                    $statusMessage .= "<p><b>Note:</b> The application family was successfully added.</p>\n";
+                    $statusMessage = "<p><b>Note:</b> The application family was successfully added.</p>\n";
                     addmsg($statusMessage, "red");
                 }
                 
             }
-            else
-            {
-               //error
-               $statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n";
-               addmsg($statusMessage, "red");
-            }
         }
         else if ($_REQUEST['type'] == 'ver')
         {
@@ -298,12 +291,6 @@ if ($_REQUEST['sub'])
                     $goodtogo = 1;
                                         
                 }
-                else
-                {
-                    //error
-                    $statusMessage = "<p><b>Database Error!<br>".mysql_error()."</b></p>\n";
-                    addmsg($statusMessage,"red");
-                }
             }
             else
             {
diff --git a/admin/editAppVersion.php b/admin/editAppVersion.php
index c1312bd..c46af2f 100644
--- a/admin/editAppVersion.php
+++ b/admin/editAppVersion.php
@@ -130,9 +130,7 @@ if(isset($_REQUEST['submit1']))
       else
       {
          //error
-               $statusMessage = "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
-               addmsg($statusMessage, "red");
-               redirect(apidb_fullurl("admin/editAppVersion.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
+         redirect(apidb_fullurl("admin/editAppVersion.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
       }
       
         } else
diff --git a/admin/editBundle.php b/admin/editBundle.php
index 14db254..4253abe 100644
--- a/admin/editBundle.php
+++ b/admin/editBundle.php
@@ -29,16 +29,12 @@ if($cmd)
 	    $result = query_appdb("DELETE FROM appBundle WHERE appId = $appId AND bundleId = $bundleId");
 	    if($result)
 		addmsg("App deleted from bundle", "green");
-	    else
-		addmsg("Failed: " . mysql_error(), "red");
 	}
     if($cmd == "add")
 	{
 	    $result = query_appdb("INSERT INTO appBundle VALUES ($bundleId, $appId)");
 	    if($result)
 		addmsg("App $appId added to Bundle $bundleId", "green");
-	    else
-                addmsg("Failed: " . mysql_error(), "red");
 	}
     redirectref();
     exit;
diff --git a/include/application.php b/include/application.php
index 5103d3f..57357c8 100644
--- a/include/application.php
+++ b/include/application.php
@@ -81,27 +81,20 @@ class Application {
 
 function deleteAppFamily($appId)
 {
-    $r = query_appdb("DELETE FROM appFamily WHERE appId = $appId");
+    $r = query_appdb("DELETE FROM appFamily WHERE appId = $appId", "Failed to delete appFamily $appId");
     if($r)
     {
-        $r = query_appdb("DELETE FROM appVersion WHERE appId = $appId");
+        $r = query_appdb("DELETE FROM appVersion WHERE appId = $appId", "Failed to delete appVersions");
         if($r)
             addmsg("Application and versions deleted", "green");
-        else
-            addmsg("Failed to delete appVersions: " . mysql_error(), "red");
-    }
-    else
-        addmsg("Failed to delete appFamily $appId: " . mysql_error(), "red");
-    
+    }   
 }
 
 function deleteAppVersion($versionId)
 {
-    $r = query_appdb("DELETE FROM appVersion WHERE versionId = $versionId");
+    $r = query_appdb("DELETE FROM appVersion WHERE versionId = $versionId","Failed to delete appVersion $versionId");
     if($r)
         addmsg("Application Version $versionId deleted", "green");
-    else
-        addmsg("Failed to delete appVersion $versionId: " . mysql_error(), "red");
 }
 
 function lookupVersionName($appId, $versionId)
diff --git a/include/category.php b/include/category.php
index 94ba45c..087151d 100644
--- a/include/category.php
+++ b/include/category.php
@@ -211,20 +211,15 @@ function make_cat_path($path, $appId = '', $versionId = '')
 
 function deleteCategory($catId)
 {
-    $r = query_appdb("SELECT appId FROM appFamily WHERE catId = $catId");
+    $r = query_appdb("SELECT appId FROM appFamily WHERE catId = $catId","Failed to delete category $catId");
     if($r)
     {
         while($ob = mysql_fetch_object($r))
             deleteAppFamily($ob->appId);
-        $r = query_appdb("DELETE FROM appCategory WHERE catId = $catId");
+        $r = query_appdb("DELETE FROM appCategory WHERE catId = $catId","Failed to delete category $catId");
        
         if($r)
             addmsg("Category $catId deleted", "green");
-        else
-            addmsg("Failed to delete category $catId:".mysql_error(), "red");
-    } else
-    {
-        addmsg("Failed to delete category $catId: ".mysql_error(), "red");
     }
 }
 
diff --git a/include/tableve.php b/include/tableve.php
index 41269aa..d27bb91 100644
--- a/include/tableve.php
+++ b/include/tableve.php
@@ -126,9 +126,7 @@ class TableVE {
     function edit($query)
     {
         $result  = query_appdb($query);
-	if(!$result)
-	    echo "Oops: ".mysql_error()."<br>$query<br>\n";
-        $nrows   = mysql_num_rows($result);
+	$nrows   = mysql_num_rows($result);
 
         echo "<form method=post action='".$_SERVER['PHP_SELF']."'>\n";
 
@@ -457,13 +455,7 @@ class TableVE {
 			
 			$update .= " WHERE ".$this->get_id($table)." = $value";
 						
-			if(!query_appdb($update))
-			{
-			    $thisError = "<p><font color=black><b>Query:</b>: $update</font></p>\n";
-			    $thisError .= "<p><font color=red>".mysql_error()."</font></p>";
-			    addmsg($thisError,"red");
-			}
-			else
+			if(query_appdb($update))
 			{
 			    addmsg("Database Operation Complete!","green");
 			}
diff --git a/include/user.php b/include/user.php
index b7dfe5e..ab200db 100644
--- a/include/user.php
+++ b/include/user.php
@@ -79,7 +79,7 @@ class User {
                               "email = '$sEmail' AND ".
                               "password = password('$sPassword')");
         if(!$result)
-            return "Error: ".mysql_error();
+            return "A database error occured";
 
         if(mysql_num_rows($result) == 0)
             return "Invalid e-mail or password";
@@ -122,11 +122,8 @@ class User {
         $sFields = "({$aInsert['FIELDS']}, `password`, `stamp`, `created`)";
         $sValues = "({$aInsert['VALUES']}, password('".$sPassword."'), NOW(), NOW() )";
 
-        if (!query_appdb("INSERT INTO user_list $sFields VALUES $sValues"))
-        {
-            return mysql_error();
-        }
-        return $this->restore($sEmail, $sPassword);
+        query_appdb("INSERT INTO user_list $sFields VALUES $sValues", "Error while creating a new user.");
+        $this->restore($sEmail, $sPassword);
     }
 
 
@@ -176,7 +173,7 @@ class User {
         $result = query_appdb("DELETE FROM user_list WHERE email = '$sEmail'");
 
         if(!$result)
-            return mysql_error();
+            return "A database error occured";
         if(mysql_affected_rows($result) == 0)
             return "No such user.";
         return 0;
diff --git a/maintainerdelete.php b/maintainerdelete.php
index 1e0bc49..c22f1ed 100644
--- a/maintainerdelete.php
+++ b/maintainerdelete.php
@@ -38,19 +38,13 @@ if($confirmed)
     }
 /*   echo html_frame_start("Removing",400,"",0);
 */
-    $result = query_appdb($query);
-    if($result)
+    if($result = query_appdb($query))
     {
         if($superMaintainer)
             echo "You were removed as a supermaintainer of ".appIdToName($appId);
         else
             echo "You were removed as a maintainer of ".appIdToName($appId).versionIdToName($versionId);
-    } else
-    {
-        //error
-        echo "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
     }
-
 } else
 {
     if($superMaintainer)
diff --git a/screenshots.php b/screenshots.php
index b07011d..c40489c 100644
--- a/screenshots.php
+++ b/screenshots.php
@@ -64,12 +64,6 @@ if($_REQUEST['cmd'])
                         addmsg("The image was successfully added into the database", "green");
                         redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
                     }
-                    else
-                    {
-                        //error
-                        $statusMessage = "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
-                        addmsg($statusMessage, "red");
-                    }
                 }
             }
         } else // we are a normal user or an anonymous and submitted a screenshot
@@ -118,12 +112,6 @@ if($_REQUEST['cmd'])
                         addmsg("The image you submitted will be added to the database database after being reviewed", "green");
                         redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
                     }
-                    else
-                    {
-                        //error
-                        $statusMessage = "<p><b>Database Error!<br />".mysql_error()."</b></p>\n";
-                        addmsg($statusMessage, "red");
-                    }
                 }
             }
         }
@@ -157,7 +145,6 @@ if($_REQUEST['cmd'])
                 redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
             } else
             {
-                addmsg("Failed to delete image: ".mysql_error(), "red");
                 redirect(apidb_fullurl("screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
             }
         }
diff --git a/votestats.php b/votestats.php
index 3d47b35..d0a3779 100644
--- a/votestats.php
+++ b/votestats.php
@@ -161,9 +161,7 @@ if(strcasecmp($categoryId, "any") == 0)
                   ORDER BY count DESC LIMIT $topNumber";
 }
 
-$result = query_appdb($sVoteQuery);
-
-if($result)
+if($result = query_appdb($sVoteQuery))
 {
     echo html_frame_start("", "90%", '', 0);
     echo html_table_begin("width='100%' align=center");
@@ -192,10 +190,6 @@ if($result)
     echo "<center><a href='help/?topic=voting'>What does this screen mean?</a></center>\n";
 
 }
-else
-{
-    echo "Error: " . mysql_error();
-}
 
 apidb_footer();