diff --git a/niflib.vcproj b/niflib.vcproj
index f45255f7b3c9afad616ed3662522360f57054ac8..09202084724b0ae8d9a4e594d35ad752f655c4b3 100644
--- a/niflib.vcproj
+++ b/niflib.vcproj
@@ -269,6 +269,7 @@
 				Name="VCLinkerTool"
 				OutputFile="bin\niflib_debug.dll"
 				Version="0.7.2"
+				GenerateDebugInformation="true"
 				ImportLibrary="lib/niflib_dll_debug.lib"
 			/>
 			<Tool
diff --git a/src/MatTexCollection.cpp b/src/MatTexCollection.cpp
index 3dec9ed17677f8b652c7c77b170d6bb6157ea6f8..a8ae354d47849d54d6bc8a07d4d272f005c51e7d 100644
--- a/src/MatTexCollection.cpp
+++ b/src/MatTexCollection.cpp
@@ -188,6 +188,9 @@ unsigned int MatTexCollection::GetMaterialIndex( const vector< Ref<NiProperty> >
 	NiAlphaPropertyRef alpha = NULL;
 
 	for ( unsigned i = 0; i < properties.size(); ++i ) {
+		if ( properties[i] == NULL ) {
+			continue;
+		}
 		if ( properties[i]->IsDerivedType( NiMaterialProperty::TYPE ) ) {
 			mat = DynamicCast<NiMaterialProperty>( properties[i] );
 		} else if ( properties[i]->IsDerivedType( NiTexturingProperty::TYPE ) ) {
diff --git a/src/obj/NiAVObject.cpp b/src/obj/NiAVObject.cpp
index 417d18a902647c1ff1c28f1a0b012b658ba493c7..d83a7be9002826c7e8a20faf2b8779b88b86be45 100644
--- a/src/obj/NiAVObject.cpp
+++ b/src/obj/NiAVObject.cpp
@@ -261,6 +261,9 @@ vector< Ref<NiProperty> > NiAVObject::GetProperties() const {
 
 Ref<NiProperty> NiAVObject::GetPropertyByType( const Type & compare_to ) {
 	for ( unsigned int i = 0; i < properties.size(); ++i ) {
+		if ( properties[i] == NULL ) {
+			continue;
+		}
 		if ( properties[i]->IsSameType( compare_to ) ) {
 			return properties[i];
 		}