diff --git a/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
index ede7d846f4b..5fb04cf0628 100644
--- a/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: LaunchBar Core
 Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
 Bundle-Vendor: Eclipse CDT
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/bundles/org.eclipse.launchbar.core/pom.xml b/bundles/org.eclipse.launchbar.core/pom.xml
index 3cf8b86a839..54292889cf8 100644
--- a/bundles/org.eclipse.launchbar.core/pom.xml
+++ b/bundles/org.eclipse.launchbar.core/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.launchbar.core</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/TargetSelector.java b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/TargetSelector.java
index edc1313d3ca..d25f950702b 100644
--- a/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/TargetSelector.java
+++ b/bundles/org.eclipse.launchbar.ui.controls/src/org/eclipse/launchbar/ui/controls/internal/TargetSelector.java
@@ -112,7 +112,7 @@ public class TargetSelector extends CSelector implements ILaunchTargetListener {
 							String compId = target.getTypeId()
 									+ (status.getCode() == Code.ERROR ? ".error" : ".warning"); //$NON-NLS-1$ //$NON-NLS-2$
 							Image image = Activator.getDefault().getImageRegistry().get(compId);
-							if (image == null) {
+							if (image == null && baseImage != null) {
 								ImageDescriptor desc = new CompositeImageDescriptor() {
 									@Override
 									protected Point getSize() {
diff --git a/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
index 9cb89b14495..7f4b7eb81aa 100644
--- a/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.launchbar.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: LaunchBar UI
 Bundle-SymbolicName: org.eclipse.launchbar.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: org.eclipse.launchbar.ui.internal.Activator
 Bundle-Vendor: Eclipse CDT
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/bundles/org.eclipse.launchbar.ui/pom.xml b/bundles/org.eclipse.launchbar.ui/pom.xml
index 56c66dd7a01..919f0336c11 100644
--- a/bundles/org.eclipse.launchbar.ui/pom.xml
+++ b/bundles/org.eclipse.launchbar.ui/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.launchbar.ui</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/features/org.eclipse.launchbar/feature.xml b/features/org.eclipse.launchbar/feature.xml
index ad98a06df76..8d3245f9840 100644
--- a/features/org.eclipse.launchbar/feature.xml
+++ b/features/org.eclipse.launchbar/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.launchbar"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="2.0.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.launchbar/pom.xml b/features/org.eclipse.launchbar/pom.xml
index cd2f48216b4..b59d46824d1 100644
--- a/features/org.eclipse.launchbar/pom.xml
+++ b/features/org.eclipse.launchbar/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.eclipse.launchbar.features</groupId>
 	<artifactId>org.eclipse.launchbar</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 
 	<packaging>eclipse-feature</packaging>
 </project>