diff --git a/app/controllers/org_subfields_controller.rb b/app/controllers/org_subfields_controller.rb
index 2b41983cc..e727912d3 100644
--- a/app/controllers/org_subfields_controller.rb
+++ b/app/controllers/org_subfields_controller.rb
@@ -51,7 +51,12 @@ class OrgSubfieldsController < ApplicationController
       @organization = Organization.find(params[:id])
     else
       domain = Secdomain.where("subname=?", request.subdomain).first
-      @organization = Organization.find(domain.pid)
+      begin
+        @organization = Organization.find(domain.pid)
+      rescue
+        render_404
+        return
+      end
     end
     if @organization.is_public? or User.current.admin? or User.current.member_of_org?(@organization)
       @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+