5 files changed, 21 insertions, 9 deletions
diff --git a/src/direct/Direct.vala b/src/direct/Direct.vala
index 59680b1..028b190 100644
--- a/src/direct/Direct.vala
+++ b/src/direct/Direct.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/direct/DirectPhoto.vala b/src/direct/DirectPhoto.vala
index 9cd86f9..4016ee2 100644
--- a/src/direct/DirectPhoto.vala
+++ b/src/direct/DirectPhoto.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -121,8 +121,10 @@ public class DirectPhoto : Photo {
     }
 
     public override Gdk.Pixbuf? get_thumbnail(int scale) throws Error {
-        return (get_metadata().get_preview_count() == 0) ? null :
-            get_orientation().rotate_pixbuf(get_metadata().get_preview(0).get_pixbuf());
+        var metadata = get_metadata();
+
+        return (metadata == null || metadata.get_preview_count() == 0) ? null :
+            get_orientation().rotate_pixbuf(metadata.get_preview(0).get_pixbuf());
     }
 
     protected override void notify_altered(Alteration alteration) {
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 58d82fc..3d23528 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -242,7 +242,12 @@ public class DirectPhotoPage : EditingHostPage {
         
         DirectPhoto? photo = DirectPhoto.global.get_file_source(initial_file);
         
-        display_mirror_of(view_controller, photo);
+        if (photo != null) {
+            display_mirror_of(view_controller, photo);
+        } else {
+            AppWindow.panic(_("Unable open photo %s. Sorry.").printf(initial_file.get_path()));
+        }
+
         initial_file = null;
     }
     
@@ -406,7 +411,12 @@ public class DirectPhotoPage : EditingHostPage {
         base.update_actions(selected_count, count);
     }
     
-    private bool check_ok_to_close_photo(Photo photo) {
+    private bool check_ok_to_close_photo(Photo? photo) {
+        // Means we failed to load the photo for some reason. Do not block
+        // shutdown
+        if (photo == null)
+            return true;
+
         if (!photo.has_alterations())
             return true;
         
diff --git a/src/direct/DirectView.vala b/src/direct/DirectView.vala
index 6f37850..afafff2 100644
--- a/src/direct/DirectView.vala
+++ b/src/direct/DirectView.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala
index 35729b7..2a33423 100644
--- a/src/direct/DirectWindow.vala
+++ b/src/direct/DirectWindow.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.