diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpServer.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpServer.java
index 67fbfc60b8..0be3dd45fa 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpServer.java
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/gadp/DbgEngGadpServer.java
@@ -22,6 +22,8 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import agent.dbgeng.gadp.impl.DbgEngGadpServerImpl;
 import ghidra.dbg.agent.AgentWindow;
 import ghidra.util.Msg;
@@ -40,7 +42,13 @@ public interface DbgEngGadpServer extends AutoCloseable {
 	 * @throws InterruptedException
 	 */
 	public static void main(String[] args) throws Exception {
-		new DbgEngRunner().run(args);
+		try {
+			new DbgEngRunner().run(args);
+		}
+		catch (Throwable t) {
+			System.err.println(ExceptionUtils.getMessage(t));
+			System.exit(1);
+		}
 	}
 
 	/**
diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelSelectableObject.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelSelectableObject.java
index 502e850ea8..88412bc4eb 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelSelectableObject.java
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelSelectableObject.java
@@ -22,7 +22,13 @@ import agent.dbgeng.manager.DbgThread;
 import agent.dbgeng.manager.impl.DbgManagerImpl;
 import agent.dbgeng.model.iface2.*;
 import ghidra.dbg.target.TargetObject;
+import ghidra.dbg.target.schema.TargetAttributeType;
+import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
 
+@TargetObjectSchemaInfo(
+	name = "Selectable",
+	attributes = {
+		@TargetAttributeType(type = Void.class) })
 public interface DbgModelSelectableObject extends DbgModelTargetObject {
 
 	public default CompletableFuture<Void> setActive() {
diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/gadp/DbgModelGadpServer.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/gadp/DbgModelGadpServer.java
index cd18fa578b..fced63082e 100644
--- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/gadp/DbgModelGadpServer.java
+++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/gadp/DbgModelGadpServer.java
@@ -19,6 +19,8 @@ import java.io.IOException;
 import java.net.SocketAddress;
 import java.util.concurrent.ExecutionException;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import agent.dbgeng.gadp.DbgEngGadpServer;
 import agent.dbgmodel.gadp.impl.DbgModelGadpServerImpl;
 import ghidra.dbg.agent.AgentWindow;
@@ -75,7 +77,13 @@ public interface DbgModelGadpServer extends DbgEngGadpServer {
 	 * @throws InterruptedException
 	 */
 	public static void main(String[] args) throws Exception {
-		new DbgModelRunner().run(args);
+		try {
+			new DbgModelRunner().run(args);
+		}
+		catch (Throwable t) {
+			System.err.println(ExceptionUtils.getMessage(t));
+			System.exit(1);
+		}
 	}
 
 	/**
diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/gadp/GdbGadpServer.java b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/gadp/GdbGadpServer.java
index 7dd7201388..5e157c993a 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/gadp/GdbGadpServer.java
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/gadp/GdbGadpServer.java
@@ -35,11 +35,8 @@ public interface GdbGadpServer extends AutoCloseable {
 		}
 		catch (Throwable t) {
 			System.err.println(ExceptionUtils.getMessage(t));
-			t.printStackTrace(System.err);
 			System.exit(1);
 		}
-
-//		new Runner().run(args);
 	}
 
 	public static GdbGadpServer newInstance(SocketAddress addr) throws IOException {
diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelSelectableObject.java b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelSelectableObject.java
index 2e30a70cfb..1cee498889 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelSelectableObject.java
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelSelectableObject.java
@@ -18,7 +18,13 @@ package agent.gdb.model.impl;
 import java.util.concurrent.CompletableFuture;
 
 import ghidra.dbg.target.TargetObject;
+import ghidra.dbg.target.schema.TargetAttributeType;
+import ghidra.dbg.target.schema.TargetObjectSchemaInfo;
 
+@TargetObjectSchemaInfo(
+	name = "Selectable",
+	attributes = {
+		@TargetAttributeType(type = Void.class) })
 interface GdbModelSelectableObject extends TargetObject {
 	CompletableFuture<Void> setActive();
 }