diff --git a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/PluginManager.java b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/PluginManager.java
index f3ecbff1..fce2d428 100644
--- a/src/main/java/the/bytecode/club/bytecodeviewer/plugin/PluginManager.java
+++ b/src/main/java/the/bytecode/club/bytecodeviewer/plugin/PluginManager.java
@@ -131,7 +131,11 @@ public final class PluginManager
         }
     
         console.setConsoleID(id);
-        activeTabbedConsole.addConsole(console.getComponent(0), activePlugin.activeContainer.name);
+        
+        final String name = (activePlugin == null || activePlugin.activeContainer == null)
+                ? console.getTitle() : activePlugin.activeContainer.name;
+        
+        activeTabbedConsole.addConsole(console.getComponent(0), name);
     }
 
     public static void register(String name, PluginLaunchStrategy strat) {