diff --git a/binaries/jars/latest_development/intrace.ecl.site.zip b/binaries/jars/latest_development/intrace.ecl.site.zip
index f6feee1..71e6ce7 100644
Binary files a/binaries/jars/latest_development/intrace.ecl.site.zip and b/binaries/jars/latest_development/intrace.ecl.site.zip differ
diff --git a/intrace.appengine/war/features/intrace.ecl.feature_0.8.0.jar b/intrace.appengine/war/features/intrace.ecl.feature_0.8.0.jar
deleted file mode 100644
index e0f829e..0000000
Binary files a/intrace.appengine/war/features/intrace.ecl.feature_0.8.0.jar and /dev/null differ
diff --git a/intrace.appengine/war/features/intrace.ecl.feature_0.8.1.jar b/intrace.appengine/war/features/intrace.ecl.feature_0.8.1.jar
new file mode 100644
index 0000000..a135255
Binary files /dev/null and b/intrace.appengine/war/features/intrace.ecl.feature_0.8.1.jar differ
diff --git a/intrace.appengine/war/intrace.ecl.site.zip b/intrace.appengine/war/intrace.ecl.site.zip
deleted file mode 100644
index bc281ec..0000000
Binary files a/intrace.appengine/war/intrace.ecl.site.zip and /dev/null differ
diff --git a/intrace.ecl.site/plugins/intrace.ecl_0.8.0.jar b/intrace.appengine/war/plugins/intrace.ecl_0.8.1.jar
similarity index 98%
rename from intrace.ecl.site/plugins/intrace.ecl_0.8.0.jar
rename to intrace.appengine/war/plugins/intrace.ecl_0.8.1.jar
index 8670685..054e935 100644
Binary files a/intrace.ecl.site/plugins/intrace.ecl_0.8.0.jar and b/intrace.appengine/war/plugins/intrace.ecl_0.8.1.jar differ
diff --git a/intrace.appengine/war/site.xml b/intrace.appengine/war/site.xml
index 3750ec4..eb46f67 100644
--- a/intrace.appengine/war/site.xml
+++ b/intrace.appengine/war/site.xml
@@ -3,7 +3,7 @@
    <description name="InTrace Update Site">
       InTrace Update Site
    </description>
-   <feature url="features/intrace.ecl.feature_0.8.0.jar" id="intrace.ecl.feature" version="0.8">
+   <feature url="features/intrace.ecl.feature_0.8.1.jar" id="intrace.ecl.feature" version="0.8.1">
       <category name="intrace.ecl.category"/>
    </feature>
    <category-def name="intrace.ecl.category" label="InTrace Eclipse Plugin"/>
diff --git a/intrace.ecl.feature/feature.xml b/intrace.ecl.feature/feature.xml
index 9aace49..e27731b 100644
--- a/intrace.ecl.feature/feature.xml
+++ b/intrace.ecl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="intrace.ecl.feature"
       label="InTrace Eclipse Plugin"
-      version="0.8">
+      version="0.8.1">
 
    <description url="https://github.com/mchr3k/org.intrace/wiki">
       Enable launching Java Applications with the InTrace agent.
@@ -20,6 +20,6 @@
          id="intrace.ecl"
          download-size="0"
          install-size="0"
-         version="0.8.0"/>
+         version="0.8.1"/>
 
 </feature>
diff --git a/intrace.ecl.plugin/META-INF/MANIFEST.MF b/intrace.ecl.plugin/META-INF/MANIFEST.MF
index 4bc49b0..19ee833 100644
--- a/intrace.ecl.plugin/META-INF/MANIFEST.MF
+++ b/intrace.ecl.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: InTrace Eclipse
 Bundle-SymbolicName: intrace.ecl;singleton:=true
-Bundle-Version: 0.8
+Bundle-Version: 0.8.1
 Bundle-Activator: intrace.ecl.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/intrace.ecl.plugin/src/intrace/ecl/ui/launching/ShowInTraceOutputAction.java b/intrace.ecl.plugin/src/intrace/ecl/ui/launching/ShowInTraceOutputAction.java
index ecdc34f..5f8ec86 100644
--- a/intrace.ecl.plugin/src/intrace/ecl/ui/launching/ShowInTraceOutputAction.java
+++ b/intrace.ecl.plugin/src/intrace/ecl/ui/launching/ShowInTraceOutputAction.java
@@ -417,7 +417,8 @@ public class ShowInTraceOutputAction implements IViewActionDelegate,
   private boolean isInTraceLaunchAvailable(ILaunch launch)
   {
     String launchIDStr = launch.getAttribute(LaunchConfigurationDelegate.INTRACE_LAUNCHKEY);
-    if (launchIDStr.length() > 0)
+    if ((launchIDStr != null) &&
+        (launchIDStr.length() > 0))
     {
       try
       {
diff --git a/intrace.ecl.site/artifacts.jar b/intrace.ecl.site/artifacts.jar
index fa15a7d..e7cf6be 100644
Binary files a/intrace.ecl.site/artifacts.jar and b/intrace.ecl.site/artifacts.jar differ
diff --git a/intrace.ecl.site/content.jar b/intrace.ecl.site/content.jar
index 50c58d5..910b125 100644
Binary files a/intrace.ecl.site/content.jar and b/intrace.ecl.site/content.jar differ
diff --git a/intrace.ecl.site/features/intrace.ecl.feature_0.8.0.jar b/intrace.ecl.site/features/intrace.ecl.feature_0.8.0.jar
deleted file mode 100644
index e0f829e..0000000
Binary files a/intrace.ecl.site/features/intrace.ecl.feature_0.8.0.jar and /dev/null differ
diff --git a/intrace.ecl.site/features/intrace.ecl.feature_0.8.1.jar b/intrace.ecl.site/features/intrace.ecl.feature_0.8.1.jar
new file mode 100644
index 0000000..a135255
Binary files /dev/null and b/intrace.ecl.site/features/intrace.ecl.feature_0.8.1.jar differ
diff --git a/intrace.appengine/war/plugins/intrace.ecl_0.8.0.jar b/intrace.ecl.site/plugins/intrace.ecl_0.8.1.jar
similarity index 98%
rename from intrace.appengine/war/plugins/intrace.ecl_0.8.0.jar
rename to intrace.ecl.site/plugins/intrace.ecl_0.8.1.jar
index 8670685..054e935 100644
Binary files a/intrace.appengine/war/plugins/intrace.ecl_0.8.0.jar and b/intrace.ecl.site/plugins/intrace.ecl_0.8.1.jar differ
diff --git a/intrace.ecl.site/site.xml b/intrace.ecl.site/site.xml
index 3750ec4..eb46f67 100644
--- a/intrace.ecl.site/site.xml
+++ b/intrace.ecl.site/site.xml
@@ -3,7 +3,7 @@
    <description name="InTrace Update Site">
       InTrace Update Site
    </description>
-   <feature url="features/intrace.ecl.feature_0.8.0.jar" id="intrace.ecl.feature" version="0.8">
+   <feature url="features/intrace.ecl.feature_0.8.1.jar" id="intrace.ecl.feature" version="0.8.1">
       <category name="intrace.ecl.category"/>
    </feature>
    <category-def name="intrace.ecl.category" label="InTrace Eclipse Plugin"/>
diff --git a/org.intrace/lib/intrace-agent.jar b/org.intrace/lib/intrace-agent.jar
index 98dd0a6..09fb0a1 100644
Binary files a/org.intrace/lib/intrace-agent.jar and b/org.intrace/lib/intrace-agent.jar differ