File handling fixes

2 files changed, 5 insertions, 1 deletions

diff --git a/src/pattern_sim.c b/src/pattern_sim.c
index 9a00b5d7..255ba736 100644
--- a/src/pattern_sim.c
+++ b/src/pattern_sim.c
@@ -256,6 +256,10 @@ int main(int argc, char *argv[])
 		image.hdr = NULL;
 
 		get_diffraction(&image, na, nb, nc);
+		if ( image.molecule == NULL ) {
+			ERROR("Couldn't open molecule.pdb\n");
+			return 1;
+		}
 		record_image(&image, !config_nowater, !config_nonoise,
 		             !config_nobloom);
 
diff --git a/src/sfac.c b/src/sfac.c
index fc174c39..7192f670 100644
--- a/src/sfac.c
+++ b/src/sfac.c
@@ -333,7 +333,7 @@ struct molecule *load_molecule()
 
 	fh = fopen("molecule.pdb", "r");
 	if ( fh == NULL ) {
-                ERROR("Couldn't open file\n");
+                ERROR("Couldn't open PDB file\n");
                 return NULL;
         }