diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptTableModel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptTableModel.java
index b51366ca68..b14527de63 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptTableModel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/script/GhidraScriptTableModel.java
@@ -255,15 +255,17 @@ class GhidraScriptTableModel extends GDynamicColumnTableModel<ResourceFile, Obje
 
 				label.setText(null);
 				label.setToolTipText(null);
-				if (info.hasErrors()) {
-					label.setToolTipText("Status: " + info.getErrorMessage());
-				}
 
 				ImageIcon icon = (ImageIcon) data.getValue();
 				label.setIcon(null);
 				if (icon != null) {
-					label.setToolTipText("Status: Script has toolbar icon");
 					label.setIcon(icon);
+					if (info.hasErrors()) {
+						label.setToolTipText("Status: " + info.getErrorMessage());
+					}
+					else {
+						label.setToolTipText("Status: Script has toolbar icon");
+					}
 				}
 				else {
 					label.setToolTipText("Status: No script toolbar icon has been set");
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java b/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java
index c38e1129c5..37c5e52016 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/script/ScriptInfo.java
@@ -518,7 +518,7 @@ public class ScriptInfo {
 	 */
 	public String getErrorMessage() {
 		if (isCompileErrors()) {
-			return "Script contains compiler errors";
+			return "Error compiling script (see console)";
 		}
 
 		if (isDuplicate()) {