diff --git a/src/main/java/hudson/plugins/concordionpresenter/ConcordionPresenter.java b/src/main/java/hudson/plugins/concordionpresenter/ConcordionPresenter.java
index d55ecc8..43876d2 100644
--- a/src/main/java/hudson/plugins/concordionpresenter/ConcordionPresenter.java
+++ b/src/main/java/hudson/plugins/concordionpresenter/ConcordionPresenter.java
@@ -104,13 +104,19 @@ public boolean perform(final AbstractBuild<?, ?> build,
 
             action = new ConcordionBuildAction(build);
 
-        } catch (IOException e) {
-            Util.displayIOException(e, listener);
+        } catch (Exception e) {
+            if (e instanceof IOException) {
+                Util.displayIOException((IOException) e, listener);
+            } else {
+                listener.fatalError("[ConcordionPresenter] " + e.getMessage());
+            }
             e.printStackTrace(listener.fatalError("[ConcordionPresenter] Failure!"));
             return true;
         }
 
         build.getActions().add(action);
+        // TODO remove diagnostic code
+        listener.getLogger().println("CPP is about to return true (like a boss)");
         return true;
     }