2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index c1f42bfe..8132fc41 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -56,7 +56,7 @@ class Combined_Controller extends Controller {
     }
 
     if (empty($key)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     $cache = Cache::instance();
@@ -71,7 +71,7 @@ class Combined_Controller extends Controller {
       $content = $cache->get($key);
     }
     if (empty($content)) {
-      Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
 
     // $type is either 'javascript' or 'css'
diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php
index bf1f80d4..86782469 100644
--- a/modules/gallery/controllers/items.php
+++ b/modules/gallery/controllers/items.php
@@ -21,7 +21,7 @@ class Items_Controller extends Controller {
   public function __call($function, $args) {
     $item = ORM::factory("item", (int)$function);
     if (!$item->loaded()) {
-      return Kohana::show_404();
+      throw new Kohana_404_Exception();
     }
     // Redirect to the more specific resource type, since it will render
     // differently.  We could also just delegate here, but it feels more appropriate