diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index 93f3ef5e38af843..ad32b4474479751 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -243,6 +243,9 @@ def end_dict(self):
         self.stack.pop()
 
     def end_key(self):
+        if not self.stack:
+            raise InvalidFileException("'key' element found outside of a 'dict' at line %d" %
+                                       self.parser.CurrentLineNumber)
         if self.current_key or not isinstance(self.stack[-1], dict):
             raise ValueError("unexpected key at line %d" %
                              self.parser.CurrentLineNumber)
diff --git a/Python/thread.c b/Python/thread.c
index 0365f977d82b0ed..5f019c4c322203e 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -335,11 +335,15 @@ PyThread_GetInfo(void)
 #ifdef HAVE_PTHREAD_STUBS
     value = Py_NewRef(Py_None);
 #else
-    value = PyUnicode_FromString("pymutex");
+#ifdef MS_WINDOWS
+    value = Py_NewRef(Py_None);
+#else
+    value = PyUnicode_FromString("semaphore");
     if (value == NULL) {
         Py_DECREF(threadinfo);
         return NULL;
     }
+#endif
 #endif
     PyStructSequence_SET_ITEM(threadinfo, pos++, value);