diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
index 21cb8055d..27d43e753 100644
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -1499,7 +1499,7 @@ private:
             path.Set(tex->RelativeFilename());
 
             const Video* media = tex->Media();
-            if(media != 0) {
+            if(media != 0 && media->ContentLength() > 0) {
                 unsigned int index;
 
                 VideoMap::const_iterator it = textures_converted.find(media);
diff --git a/code/FBXDocument.h b/code/FBXDocument.h
index a149eb446..3d8f18801 100644
--- a/code/FBXDocument.h
+++ b/code/FBXDocument.h
@@ -701,7 +701,6 @@ public:
     uint8_t* RelinquishContent() {
         uint8_t* ptr = content;
         content = 0;
-        contentLength = 0;
         return ptr;
     }