Index: trunk/glueforge/templates/psdb/selectrowobjects.tt
===================================================================
--- trunk/glueforge/templates/psdb/selectrowobjects.tt	(revision 9742)
+++ trunk/glueforge/templates/psdb/selectrowobjects.tt	(revision 15790)
@@ -16,4 +16,10 @@
     for (i = 0; i < rowSet->n; i++) {
         [% table.object_name %] *object = [% table.namespace %]ObjectFromMetadata(rowSet->data[i]);
+        if (!object) {
+            psFree(object);
+            psFree(returnSet);
+            psError(PS_ERR_UNKNOWN, false, "database error");
+            return NULL;
+        }
         psArrayAdd(returnSet, 0, object);
         psFree(object);