diff --git a/modpol_core/modules/change_policy.lua b/modpol_core/modules/change_policy.lua
index 4ed176d..6fb8b1b 100644
--- a/modpol_core/modules/change_policy.lua
+++ b/modpol_core/modules/change_policy.lua
@@ -109,8 +109,8 @@ function change_policy:approve_change(module_slug, policy, input)
       function()
          modpol.interactions.message(
             self.initiator,
-            "Updating " .. policy .. " policy on module " ..
-            module_slug .. " with: " .. input)
+            "In ".. self.org.name .. " updating " .. policy ..
+            " policy on module " .. module_slug .. " with: " .. input)
          self.org.policies[module_slug][policy] = input
          modpol.interactions.org_dashboard(
             self.initiator, self.org.id)
diff --git a/modpol_core/orgs/process.lua b/modpol_core/orgs/process.lua
index 9c39093..d322d38 100644
--- a/modpol_core/orgs/process.lua
+++ b/modpol_core/orgs/process.lua
@@ -15,17 +15,15 @@ function modpol.orgs:call_module(module_slug, initiator, config, result, parent_
       and result() then
       result()
       return
+   elseif not modpol.modules[module_slug] then
+   -- if module doesn't exist, abort
+      modpol.ocutil.log('Error in ' .. self.name .. ':call_module -> module "' .. tostring(module_slug) .. '" not found')
+      return
    end
 
-   -- if module doesn't exist, abort
-   if not modpol.modules[module_slug] then
-      modpol.ocutil.log('Error in ' .. self.name .. ':call_module -> module "' .. tostring(module_slug) .. '" not found')
-        return
-    end
-
-    local index = #self.processes + 1
-
-    local module = modpol.modules[module_slug]
+   local index = #self.processes + 1
+   
+   local module = modpol.modules[module_slug]
 
     -- first applies any relevant org policies
     -- then overrides with the config values given on input