diff --git a/code/ObjTools.h b/code/ObjTools.h
index e9f6a667e..202fcc834 100644
--- a/code/ObjTools.h
+++ b/code/ObjTools.h
@@ -57,7 +57,14 @@ namespace Assimp
 template<class char_t>
 inline bool isEndOfBuffer(  char_t it, char_t end )
 {
-	end--;
+	if ( it == end )
+	{
+		return true;
+	}
+	else
+	{
+		end--;
+	}
 	return ( it == end );	
 }