Index: /trunk/psLib/src/collections/psBitSet.c
===================================================================
--- /trunk/psLib/src/collections/psBitSet.c	(revision 1161)
+++ /trunk/psLib/src/collections/psBitSet.c	(revision 1162)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,4 +27,5 @@
 #include "psMemory.h"
 #include "psError.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -90,4 +91,7 @@
     numBytes = ceil(n/8.0);
     newObj = psAlloc(sizeof(psBitSet));
+    if(newObj == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
     p_psMemSetDeallocator(newObj,(psFreeFcn)bitSetFree);
     newObj->n = numBytes;
@@ -96,4 +100,8 @@
     /*@i@*/
     newObj->bits = psAlloc(sizeof(char)*numBytes);
+    if(newObj->bits == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     memset(newObj->bits, numBytes, 0);
 
@@ -225,4 +233,8 @@
     int numBits = inBitSet->n*8;
     char* outString = psAlloc((size_t)numBits+1);
+    if(outString == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     for(i=0; i<numBits; i++) {
         outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';
Index: /trunk/psLib/src/collections/psScalar.c
===================================================================
--- /trunk/psLib/src/collections/psScalar.c	(revision 1161)
+++ /trunk/psLib/src/collections/psScalar.c	(revision 1162)
@@ -8,6 +8,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-19 01:59:51 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,5 @@
 #include "psScalar.h"
 #include "psLogMsg.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -61,4 +62,8 @@
     // Create scalar
     scalar = (psScalar *)psAlloc(sizeof(psScalar));
+    if(scalar == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     scalar->type.dimen = PS_DIMEN_SCALAR;
     scalar->type.type = dataType;
Index: /trunk/psLib/src/mathtypes/psScalar.c
===================================================================
--- /trunk/psLib/src/mathtypes/psScalar.c	(revision 1161)
+++ /trunk/psLib/src/mathtypes/psScalar.c	(revision 1162)
@@ -8,6 +8,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-19 01:59:51 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,5 @@
 #include "psScalar.h"
 #include "psLogMsg.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -61,4 +62,8 @@
     // Create scalar
     scalar = (psScalar *)psAlloc(sizeof(psScalar));
+    if(scalar == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     scalar->type.dimen = PS_DIMEN_SCALAR;
     scalar->type.type = dataType;
Index: /trunk/psLib/src/types/psBitSet.c
===================================================================
--- /trunk/psLib/src/types/psBitSet.c	(revision 1161)
+++ /trunk/psLib/src/types/psBitSet.c	(revision 1162)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:14:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,4 +27,5 @@
 #include "psMemory.h"
 #include "psError.h"
+#include "psAbort.h"
 
 /******************************************************************************/
@@ -90,4 +91,7 @@
     numBytes = ceil(n/8.0);
     newObj = psAlloc(sizeof(psBitSet));
+    if(newObj == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
     p_psMemSetDeallocator(newObj,(psFreeFcn)bitSetFree);
     newObj->n = numBytes;
@@ -96,4 +100,8 @@
     /*@i@*/
     newObj->bits = psAlloc(sizeof(char)*numBytes);
+    if(newObj->bits == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     memset(newObj->bits, numBytes, 0);
 
@@ -225,4 +233,8 @@
     int numBits = inBitSet->n*8;
     char* outString = psAlloc((size_t)numBits+1);
+    if(outString == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     for(i=0; i<numBits; i++) {
         outString[numBits-i-1] = (psBitSetTest(inBitSet, i) == 1)?'1':'0';