diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp
index fa34c833..abf2f37a 100644
--- a/source/Irrlicht/CB3DMeshFileLoader.cpp
+++ b/source/Irrlicht/CB3DMeshFileLoader.cpp
@@ -569,6 +569,9 @@ bool CB3DMeshFileLoader::readChunkTRIS(CSkinnedMesh::SJoint *InJoint, scene::SSk
 
 		for(s32 i=0; i<3; ++i)
 		{
+			if ((u32)vertex_id[i] >= AnimatedVertices_VertexID.size())
+				return false;
+
 			if (AnimatedVertices_VertexID[ vertex_id[i] ] != -1)
 			{
 				if ( AnimatedVertices_BufferID[ vertex_id[i] ] != (s32)MeshBufferID ) //If this vertex is linked in a different meshbuffer
diff --git a/source/Irrlicht/CImageLoaderBMP.cpp b/source/Irrlicht/CImageLoaderBMP.cpp
index b6976228..3c115c7e 100644
--- a/source/Irrlicht/CImageLoaderBMP.cpp
+++ b/source/Irrlicht/CImageLoaderBMP.cpp
@@ -257,7 +257,7 @@ IImage* CImageLoaderBMP::loadImage(irr::io::IReadFile* file) const
 	long pos = file->getPos();
 	s32 paletteSize = (header.BitmapDataOffset - pos) / 4;
 
-	s32* paletteData;
+	s32* paletteData = 0;
 	if (paletteSize)
 	{
 		paletteData = new s32[paletteSize];