diff --git a/panda/src/gobj/shader.I b/panda/src/gobj/shader.I
index 43aade9b95..1238fc5410 100644
--- a/panda/src/gobj/shader.I
+++ b/panda/src/gobj/shader.I
@@ -56,6 +56,7 @@ get_filename(ShaderType type) const {
  */
 INLINE void Shader::
 set_filename(ShaderType type, const Filename &filename) {
+  _filename._separate = true;
   switch (type) {
   case ST_vertex:
     _filename._vertex = filename;
@@ -77,6 +78,7 @@ set_filename(ShaderType type, const Filename &filename) {
     break;
   default:
     _filename._shared = filename;
+    _filename._separate = false;
   }
 }
 
diff --git a/panda/src/pnmimage/pnmImageHeader.cxx b/panda/src/pnmimage/pnmImageHeader.cxx
index ae7c3ef3b5..a0098b58f7 100644
--- a/panda/src/pnmimage/pnmImageHeader.cxx
+++ b/panda/src/pnmimage/pnmImageHeader.cxx
@@ -343,7 +343,7 @@ make_writer(ostream *file, bool owns_file, const Filename &filename,
     delete file;
   }
 
-  if (!writer->is_valid()) {
+  if (writer != NULL && !writer->is_valid()) {
     delete writer;
     writer = NULL;
   }