diff --git a/launch/org.eclipse.cdt.launchbar.cdt.core/src/org/eclipse/cdt/launchbar/cdt/core/internal/CDTLaunchConfigProvider.java b/launch/org.eclipse.cdt.launchbar.cdt.core/src/org/eclipse/cdt/launchbar/cdt/core/internal/CDTLaunchConfigProvider.java
index 852077c7654..b3cda3eacd0 100644
--- a/launch/org.eclipse.cdt.launchbar.cdt.core/src/org/eclipse/cdt/launchbar/cdt/core/internal/CDTLaunchConfigProvider.java
+++ b/launch/org.eclipse.cdt.launchbar.cdt.core/src/org/eclipse/cdt/launchbar/cdt/core/internal/CDTLaunchConfigProvider.java
@@ -18,7 +18,7 @@ public class CDTLaunchConfigProvider implements ILaunchConfigurationsProvider {
 
 	@Override
 	public ILaunchConfigurationDescriptor filterDescriptor(ILaunchConfigurationDescriptor descriptor) {
-		return null;
+		return descriptor;
 	}
 
 }
diff --git a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java
index 9c15ff9fba2..e80d9b8a668 100644
--- a/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java
+++ b/launch/org.eclipse.cdt.launchbar.core/src/org/eclipse/cdt/launchbar/core/internal/LaunchBarManager.java
@@ -46,7 +46,7 @@ public class LaunchBarManager extends PlatformObject implements ILaunchBarManage
 	private List<ProviderExtensionDescriptor> providers = new ArrayList<>();
 	private Map<String, ILaunchConfigurationDescriptor> configDescs = new HashMap<>();
 	private ILaunchConfigurationDescriptor lastConfigDesc, activeConfigDesc;
-	private ILaunchMode[] launchModes;
+	private ILaunchMode[] launchModes = new ILaunchMode[0];
 	private ILaunchMode activeLaunchMode;
 
 	private final LocalTargetType localTargetType = new LocalTargetType();
@@ -112,6 +112,8 @@ public class LaunchBarManager extends PlatformObject implements ILaunchBarManage
 		ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
 		for (ILaunchConfiguration configuration : launchManager.getLaunchConfigurations()) {
 			ILaunchConfigurationDescriptor configDesc = new DefaultLaunchConfigurationDescriptor(configuration);
+			
+			
 			for (ProviderExtensionDescriptor provider : providers) {
 				configDesc = provider.getProvider().filterDescriptor(configDesc);
 			}