Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1395)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1395)
@@ -0,0 +1,4 @@
+ <DATE> <TIME> |<HOST>|E|psMetadataFRead|Null FITS file descriptor not allowed
+ <DATE> <TIME> |<HOST>|E|psMetadataFRead|Null extName and extNum = 0 not allowed
+ <DATE> <TIME> |<HOST>|E|psMetadataFRead|FITS error while locating header 22: tried to move past end of file
+ <DATE> <TIME> |<HOST>|E|psMetadataFRead|FITS error while locating header AARGH: illegal HDU number
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1394)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1395)
@@ -7,8 +7,8 @@
 FITS file open status: OK - no error
 
+Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
+Key Name:   BITPIX  Key Type:  2  Key Value:               8  Key Comment: number of bits per data pixel
+Key Name:    NAXIS  Key Type:  2  Key Value:               0  Key Comment: number of data axes
 Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T <DATE> 
-Key Name:    NAXIS  Key Type:  2  Key Value:               0  Key Comment: number of data axes
-Key Name:   BITPIX  Key Type:  2  Key Value:               8  Key Comment: number of bits per data pixel
-Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
@@ -24,16 +24,16 @@
 FITS file open status: OK - no error
 
+Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
+Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
+Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_1'  Key Comment: 
 Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T <DATE> 
 Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T <DATE> 
 Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T <DATE> 
 Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T <DATE> 
-Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_1'  Key Comment: 
-Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
-Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
-Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
-Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
-Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
-Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
-Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -49,15 +49,61 @@
 FITS file open status: OK - no error
 
-Key Name:  COMMENT  Key Type:  5  Key Value:                  Key Comment:   and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H
-Key Name:  COMMENT  Key Type:  5  Key Value:                  Key Comment:   FITS (Flexible Image Transport System) format is defined in 'Astronomy
-Key Name:   EXTEND  Key Type:  1  Key Value:               1  Key Comment: FITS dataset may contain extensions
+Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
 Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
-Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
-Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
-Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
+Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
+Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T <DATE> 
+Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T <DATE> 
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
 
 
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test D - Attempt to use null file descriptor}   *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Null FITS file descriptor not allowed                      *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test D - Attempt to use null file descriptor} | tst_psMetadata_01.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test E - Attempt to use two null inputs}        *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Null extName and extNum = 0 not allowed                    *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test E - Attempt to use two null inputs} | tst_psMetadata_01.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test F - Attempt to use bad extNum}             *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: FITS error while locating header 22: tried to move past end of file *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test F - Attempt to use bad extNum} | tst_psMetadata_01.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test F - Attempt to use bad extName}            *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText:                                                            *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test F - Attempt to use bad extName} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\