Index: /trunk/psLib/src/astronomy/psMetadata.c
===================================================================
--- /trunk/psLib/src/astronomy/psMetadata.c	(revision 1429)
+++ /trunk/psLib/src/astronomy/psMetadata.c	(revision 1430)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-09 23:02:43 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 23:03:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -443,5 +443,5 @@
     entry = (psMetadataItem *) psHashLookup(mdTable, key);
     if (entry == NULL) {
-        psError(__func__, "Could not find metadata item with given key. Key: %s", key);
+        psError(__func__, "Could not find metadata item with key. Key: %s", key);
         return NULL;
     }
Index: /trunk/psLib/src/collections/psMetadata.c
===================================================================
--- /trunk/psLib/src/collections/psMetadata.c	(revision 1429)
+++ /trunk/psLib/src/collections/psMetadata.c	(revision 1430)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-09 19:30:44 $
+*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 23:02:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -424,4 +424,10 @@
     psMetadataItem *entry = NULL;
 
+
+    if (md == NULL) {
+        psError(__func__, "Null metadata collection not allowed");
+        return NULL;
+    }
+
     mdTable = md->table;
     if (mdTable == NULL) {
@@ -449,4 +455,10 @@
     psMetadataItem *entry = NULL;
 
+
+    if (md == NULL) {
+        psError(__func__, "Null metadata collection not allowed");
+        return NULL;
+    }
+
     mdList = md->list;
     if (mdList == NULL) {
@@ -467,4 +479,9 @@
 {
     psList *mdList = NULL;
+
+    if (md == NULL) {
+        psError(__func__, "Null metadata collection not allowed");
+        return false;
+    }
 
     mdList = md->list;
Index: /trunk/psLib/src/types/psMetadata.c
===================================================================
--- /trunk/psLib/src/types/psMetadata.c	(revision 1429)
+++ /trunk/psLib/src/types/psMetadata.c	(revision 1430)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-09 19:30:44 $
+*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-09 23:02:43 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -424,4 +424,10 @@
     psMetadataItem *entry = NULL;
 
+
+    if (md == NULL) {
+        psError(__func__, "Null metadata collection not allowed");
+        return NULL;
+    }
+
     mdTable = md->table;
     if (mdTable == NULL) {
@@ -449,4 +455,10 @@
     psMetadataItem *entry = NULL;
 
+
+    if (md == NULL) {
+        psError(__func__, "Null metadata collection not allowed");
+        return NULL;
+    }
+
     mdList = md->list;
     if (mdList == NULL) {
@@ -467,4 +479,9 @@
 {
     psList *mdList = NULL;
+
+    if (md == NULL) {
+        psError(__func__, "Null metadata collection not allowed");
+        return false;
+    }
 
     mdList = md->list;