Index: libs/libmythtv/dsmcccache.cpp
===================================================================
--- libs/libmythtv/dsmcccache.cpp	(revision 9838)
+++ libs/libmythtv/dsmcccache.cpp	(working copy)
@@ -208,7 +208,7 @@
     pDir->m_Files.insert(name, *entry);
 
     VERBOSE(VB_DSMCC,
-            QString("[DSMCCCache] Adding file with name %1s reference %2")
+            QString("[DSMCCCache] Adding file with name %1 reference %2")
             .arg(name.ascii()).arg(entry->toString()));
 }
 
@@ -287,7 +287,7 @@
             QMap<QString, DSMCCCacheReference>::Iterator ref =
                 dir->m_Files.find(name);
 
-            if (ref == NULL)
+            if (ref == dir->m_Files.end())
                 return -1; // Not there.
 
             DSMCCCacheFile *fil = FindFileData(*ref);
@@ -303,7 +303,7 @@
             QMap<QString, DSMCCCacheReference>::Iterator ref =
                 dir->m_SubDirectories.find(name);
 
-            if (ref == NULL)
+            if (ref == dir->m_SubDirectories.end())
                 return -1; // Not there
 
             dir = FindDir(*ref);