diff --git a/code/Collada/ColladaHelper.cpp b/code/Collada/ColladaHelper.cpp
index aeabb49c4..8fa42b4d9 100644
--- a/code/Collada/ColladaHelper.cpp
+++ b/code/Collada/ColladaHelper.cpp
@@ -94,9 +94,10 @@ void ToCamelCase(std::string &text)
         }
         else
         {
-            // Make lower case
-            (*it) = ToLower(*it);
+            // Make next one lower case
             ++it;
+            if (it != text.end())
+                (*it) = ToLower(*it);
         }
     }
 }
diff --git a/test/unit/utColladaExportLight.cpp b/test/unit/utColladaExportLight.cpp
index 9b3e8a0e7..c2aa17b2b 100644
--- a/test/unit/utColladaExportLight.cpp
+++ b/test/unit/utColladaExportLight.cpp
@@ -138,7 +138,7 @@ TEST_F(ColladaExportLight, testExportLight)
     aiString readModified;
 	EXPECT_TRUE(imported->mMetaData->Get("Modified", readModified)) << "No modified metadata";
     EXPECT_STRNE(origModified.C_Str(), readModified.C_Str()) << "Modified date did not change";
-    EXPECT_GT(readModified.length, 18) << "Modified date too short";
+    EXPECT_GT(readModified.length, ai_uint32(18)) << "Modified date too short";
 
     // Lights
     EXPECT_TRUE(imported->HasLights());