diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java
index 07fe6bc906..09d616f7a8 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java
@@ -160,7 +160,8 @@ public abstract class PluginTool extends AbstractDockingTool {
 			String name, boolean isDockable, boolean hasStatus, boolean isModal) {
 		this.project = project;
 		this.projectManager = projectManager;
-		this.toolServices = toolServices;
+		this.toolServices = toolServices == null ? new ToolServicesAdapter() : toolServices;
+
 		propertyChangeMgr = new PropertyChangeSupport(this);
 		optionsMgr = new OptionsManager(this);
 		winMgr = createDockingWindowManager(isDockable, hasStatus, isModal);
@@ -1317,6 +1318,9 @@ public abstract class PluginTool extends AbstractDockingTool {
 		if (project != null) {
 			toolServices = project.getToolServices();
 		}
+		else {
+			toolServices = new ToolServicesAdapter();
+		}
 	}
 
 	protected void restorePluginsFromXml(Element elem) throws PluginException {