Index: /trunk/psLib/src/sys/psString.h
===================================================================
--- /trunk/psLib/src/sys/psString.h	(revision 9577)
+++ /trunk/psLib/src/sys/psString.h	(revision 9578)
@@ -14,6 +14,6 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 00:32:39 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-14 03:50:28 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -136,4 +136,5 @@
 ) __attribute__((format(printf, 2, 3)));
 # else // __GNUC__
+
     ssize_t psStringPrepend(
         char **dest,                        ///< existing string
@@ -206,4 +207,14 @@
 );
 
+
+#define PS_ASSERT_STRING_NON_EMPTY(NAME, RVAL) \
+if (!(NAME) || strlen(NAME) == 0) { \
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+            "Error: String %s is NULL or empty.", \
+            #NAME); \
+    return(RVAL); \
+}
+
+
 /** @} */// Doxygen - End of SystemGroup Functions
 
Index: /trunk/psLib/src/types/psMetadata.h
===================================================================
--- /trunk/psLib/src/types/psMetadata.h	(revision 9577)
+++ /trunk/psLib/src/types/psMetadata.h	(revision 9578)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-13 22:42:28 $
+*  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-14 03:50:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1189,4 +1189,14 @@
 
 
+/// Assert on metadata with extant hash and list components
+#define PS_ASSERT_METADATA_NON_NULL(NAME, RVAL) \
+if (!(NAME) || !(NAME)->hash || !(NAME)->list) { \
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
+            "Error: Metadata %s or one of its components is NULL.", \
+            #NAME); \
+    return(RVAL); \
+}
+
+
 /// @}