Index: trunk/psModules/src/camera/pmFPAview.c
===================================================================
--- trunk/psModules/src/camera/pmFPAview.c	(revision 15096)
+++ trunk/psModules/src/camera/pmFPAview.c	(revision 15972)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-29 01:26:55 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-02 20:33:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38,4 +38,10 @@
     pmFPAviewReset(view);
     return view;
+}
+
+bool psMemCheckFPAview(psPtr ptr)
+{
+    PS_ASSERT_PTR(ptr, false);
+    return ( psMemGetDeallocator(ptr) == (psFreeFunc) pmFPAviewFree);
 }
 
@@ -146,8 +152,8 @@
     PS_ASSERT_PTR_NON_NULL(view, NULL);
     PS_ASSERT_PTR_NON_NULL(fpa, NULL);
-
     if (view->cell < 0) {
         return NULL;
     }
+    PS_ASSERT_PTR_NON_NULL(fpa->chips, NULL);
 
     pmChip *chip = pmFPAviewThisChip (view, fpa);
@@ -209,4 +215,5 @@
     pmCell *cell = pmFPAviewThisCell (view, fpa);
     PS_ASSERT_PTR_NON_NULL(cell, NULL);
+    PS_ASSERT_PTR_NON_NULL(cell->readouts, NULL);
 
     if (view->readout >= cell->readouts->n) {