diff --git a/agent/apiharness/src/main/java/com/intuit/tank/harness/TestPlanStarter.java b/agent/apiharness/src/main/java/com/intuit/tank/harness/TestPlanStarter.java
index 515563f74..7e35e0a38 100644
--- a/agent/apiharness/src/main/java/com/intuit/tank/harness/TestPlanStarter.java
+++ b/agent/apiharness/src/main/java/com/intuit/tank/harness/TestPlanStarter.java
@@ -160,7 +160,7 @@ public void run() {
                 }
                 done = true;
             } catch (final Throwable t) {
-                LOG.error(LogUtil.getLogMessage("Linear - TestPlanStarter Unknown Error:"), t);
+                LOG.error(LogUtil.getLogMessage("Linear - TestPlanStarter Error:" + t.getMessage()), t);
                 throwUnchecked(t);
             }
         } else { // Nonlinear Workload
@@ -257,7 +257,7 @@ public void run() {
                 }
                 done = true;
             } catch (final Throwable t) {
-                LOG.error(LogUtil.getLogMessage("Nonlinear - TestPlanStarter Unknown Error:"), t);
+                LOG.error(LogUtil.getLogMessage("Nonlinear - TestPlanStarter Error:" + t.getMessage()), t);
                 throwUnchecked(t);
             }
         }
diff --git a/agent/apiharness/src/main/java/com/intuit/tank/runner/TestPlanRunner.java b/agent/apiharness/src/main/java/com/intuit/tank/runner/TestPlanRunner.java
index 3a96db1b9..ce8bb7ff7 100644
--- a/agent/apiharness/src/main/java/com/intuit/tank/runner/TestPlanRunner.java
+++ b/agent/apiharness/src/main/java/com/intuit/tank/runner/TestPlanRunner.java
@@ -305,6 +305,11 @@ private void runScriptSteps(HDScriptUseCase hdScriptUseCase) throws KillScriptEx
             String validation = TankConstants.HTTP_CASE_FAIL;
             try {
                 validation = tsr.execute();
+            } catch (Error e) {
+                if(e instanceof OutOfMemoryError){
+                    throw (OutOfMemoryError) e;
+                }
+                throw new Error(e);
             } catch (Exception e) {
                 if (e instanceof RuntimeException) {
                     throw (RuntimeException) e;