diff --git a/db.class.php b/db.class.php
index 6d29ae6..4a586a5 100644
--- a/db.class.php
+++ b/db.class.php
@@ -674,7 +674,7 @@ class MeekroDB {
   public function queryFirstRow() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'query'), $args);
-    if (! $result) return null;
+    if (!$result || !is_array($result)) return null;
     return reset($result);
   }
 
@@ -682,7 +682,7 @@ class MeekroDB {
   public function queryFirstList() {
     $args = func_get_args();
     $result = call_user_func_array(array($this, 'queryAllLists'), $args);
-    if (! $result) return null;
+    if (!$result || !is_array($result)) return null;
     return reset($result);
   }
   
diff --git a/simpletest/BasicTest.php b/simpletest/BasicTest.php
index bd408aa..913d439 100644
--- a/simpletest/BasicTest.php
+++ b/simpletest/BasicTest.php
@@ -274,7 +274,7 @@ class BasicTest extends SimpleTest {
     DB::insert('storedata', array(
       'picture' => $smile,
     ));
-    DB::query("INSERT INTO storedata (picture) VALUES (%s)", $smile);
+    DB::queryOneRow("INSERT INTO storedata (picture) VALUES (%s)", $smile);
     
     $getsmile = DB::queryFirstField("SELECT picture FROM storedata WHERE id=1");
     $getsmile2 = DB::queryFirstField("SELECT picture FROM storedata WHERE id=2");