4 files changed, 10 insertions, 8 deletions
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index 559d5d9..15ceaa8 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -878,7 +878,7 @@ Ttk_Layout Ttk_CreateLayout(
     if (!layoutTemplate) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"Layout %s not found", styleName));
-	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "LAYOUT", NULL);
+	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "LAYOUT", styleName, NULL);
 	return 0;
     }
 
@@ -919,7 +919,7 @@ Ttk_CreateSublayout(
     if (!layoutTemplate) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"Layout %s not found", styleName));
-	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "LAYOUT", NULL);
+	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "LAYOUT", styleName, NULL);
 	return 0;
     }
 
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index 12d481f..f4b14c9 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -848,7 +848,7 @@ static int PanedSashposCommand(
     if (sashIndex < 0 || sashIndex >= Ttk_NumberSlaves(pw->paned.mgr) - 1) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	    "sash index %d out of range", sashIndex));
-	Tcl_SetErrorCode(interp, "TTK", "PANE", "SASHIDX", NULL);
+	Tcl_SetErrorCode(interp, "TTK", "PANE", "SASH_INDEX", NULL);
 	return TCL_ERROR;
     }
 
diff --git a/generic/ttk/ttkState.c b/generic/ttk/ttkState.c
index 151dc4d..c34b900 100644
--- a/generic/ttk/ttkState.c
+++ b/generic/ttk/ttkState.c
@@ -218,7 +218,7 @@ Tcl_Obj *Ttk_StateMapLookup(
     }
     if (interp) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj("No match in state map", -1));
-	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "STATE", NULL);
+	Tcl_SetErrorCode(interp, "TTK", "STATE", "UNMATCHED", NULL);
     }
     return NULL;
 }
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index 6e7b477..5097abc 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -594,7 +594,7 @@ static Ttk_Theme LookupTheme(
     if (!entryPtr) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"theme \"%s\" doesn't exist", name));
-	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "THEME", NULL);
+	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "THEME", name, NULL);
 	return NULL;
     }
 
@@ -1499,7 +1499,8 @@ static int StyleElementCreateCmd(
     if (!entryPtr) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"No such element type %s", factoryName));
-	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "ELEMENT_TYPE", NULL);
+	Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "ELEMENT_TYPE", factoryName,
+		NULL);
 	return TCL_ERROR;
     }
 
@@ -1560,7 +1561,7 @@ static int StyleElementOptionsCmd(
 
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	"element %s not found", elementName));
-    Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "ELEMENT", NULL);
+    Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "ELEMENT", elementName, NULL);
     return TCL_ERROR;
 }
 
@@ -1586,7 +1587,8 @@ static int StyleLayoutCmd(
 	if (!layoutTemplate) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"Layout %s not found", layoutName));
-	    Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "LAYOUT", NULL);
+	    Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "LAYOUT", layoutName,
+		NULL);
 	    return TCL_ERROR;
 	}
 	Tcl_SetObjResult(interp, Ttk_UnparseLayoutTemplate(layoutTemplate));