diff --git a/generic/ttk/ttkCache.c b/generic/ttk/ttkCache.c
index a8eb8cab0..cf6e33180 100644
--- a/generic/ttk/ttkCache.c
+++ b/generic/ttk/ttkCache.c
@@ -352,7 +352,7 @@ static Tcl_Obj *Ttk_Use(
 	return Tcl_GetHashValue(entryPtr);
 #else
 	Ttk_Cached *cachedPtr = Tcl_GetHashValue(entryPtr);
-	return cachedPtr->objPtr;
+	return cachedPtr ? cachedPtr->objPtr : NULL;
 #endif
     }
 
diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl
index 9bf93b899..5f7d79b7f 100644
--- a/library/xmfbox.tcl
+++ b/library/xmfbox.tcl
@@ -804,7 +804,7 @@ proc ::tk::MotifFDialog_ActivateFEnt {w} {
 # ::tk::MotifFDialog_ActivateSEnt --
 #
 #	This procedure is called when the user presses Return inside
-#	the "selection" entry. It sets the ::tk::Priv(selectFilePath)
+#	the "selection" entry. It sets the ::tk::dialog::file::selectFilePath
 #	variable so that the vwait loop in tk::MotifFDialog will be
 #	terminated.
 #