Index: /trunk/psLib/src/dataIO/psDB.c
===================================================================
--- /trunk/psLib/src/dataIO/psDB.c	(revision 4310)
+++ /trunk/psLib/src/dataIO/psDB.c	(revision 4311)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 21:33:46 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:52:56 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -548,4 +548,10 @@
     if(dbh == NULL) {
         psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return false;
+    }
+
+    // Verify row array is non-NULL
+    if(rowSet == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_INSERT_ROW_FAIL);
         return false;
     }
@@ -1025,4 +1031,17 @@
     psMetadataItem  *item;
 
+    // Check if table is NULL
+    if(tableName == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        return NULL;
+    }
+
+    // Check if row is NULL
+    if(row == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        return NULL;
+    }
+
+    // Start building query string
     psStringAppend(&query, "INSERT INTO %s (", tableName);
 
Index: /trunk/psLib/src/db/psDB.c
===================================================================
--- /trunk/psLib/src/db/psDB.c	(revision 4310)
+++ /trunk/psLib/src/db/psDB.c	(revision 4311)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 21:33:46 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 00:52:56 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -548,4 +548,10 @@
     if(dbh == NULL) {
         psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return false;
+    }
+
+    // Verify row array is non-NULL
+    if(rowSet == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_INSERT_ROW_FAIL);
         return false;
     }
@@ -1025,4 +1031,17 @@
     psMetadataItem  *item;
 
+    // Check if table is NULL
+    if(tableName == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        return NULL;
+    }
+
+    // Check if row is NULL
+    if(row == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_QUERY_GEN_FAIL);
+        return NULL;
+    }
+
+    // Start building query string
     psStringAppend(&query, "INSERT INTO %s (", tableName);