diff --git a/src/osg/BufferObject.cpp b/src/osg/BufferObject.cpp
index 798333d71..d93419942 100644
--- a/src/osg/BufferObject.cpp
+++ b/src/osg/BufferObject.cpp
@@ -145,7 +145,7 @@ void GLBufferObject::compileBuffer()
             BufferEntry entry;
             entry.offset = newTotalSize;
             entry.modifiedCount = 0xffffff;
-            entry.dataSize = bd->getTotalDataSize();
+            entry.dataSize = bd ? bd->getTotalDataSize() : 0;
             entry.dataSource = bd;
 #if 0
             OSG_NOTICE<<"entry"<<std::endl;
@@ -199,7 +199,7 @@ void GLBufferObject::compileBuffer()
         ++itr)
     {
         BufferEntry& entry = *itr;
-        if (compileAll || entry.modifiedCount != entry.dataSource->getModifiedCount())
+        if (entry.dataSource && (compileAll || entry.modifiedCount != entry.dataSource->getModifiedCount()))
         {
             // OSG_NOTICE<<"GLBufferObject::compileBuffer(..) downloading BufferEntry "<<&entry<<std::endl;
             entry.modifiedCount = entry.dataSource->getModifiedCount();
@@ -1307,7 +1307,7 @@ unsigned int BufferObject::addBufferData(BufferData* bd)
 
     _bufferDataList.push_back(bd);
 
-    // OSG_NOTICE<<"BufferObject "<<this<<":"<<className()<<"::addBufferData("<<bd<<"), bufferIndex= "<<_bufferDataList.size()-1<<std::endl;
+    //OSG_NOTICE<<"BufferObject "<<this<<":"<<className()<<"::addBufferData("<<bd<<"), bufferIndex= "<<_bufferDataList.size()-1<<std::endl;
 
     return _bufferDataList.size()-1;
 }
@@ -1320,7 +1320,7 @@ void BufferObject::removeBufferData(unsigned int index)
         return;
     }
 
-    // OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<index<<"), size= "<<_bufferDataList.size()<<std::endl;
+    //OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<index<<"), size= "<<_bufferDataList.size()<<std::endl;
 
     // alter the indices of the BufferData after the entry to be removed so their indices are correctly placed.
     for(unsigned int i=index+1; i<_bufferDataList.size(); ++i)
@@ -1340,7 +1340,7 @@ void BufferObject::removeBufferData(unsigned int index)
 
 void BufferObject::removeBufferData(BufferData* bd)
 {
-    // OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<bd<<"), index="<<bd->getBufferIndex()<<" size= "<<_bufferDataList.size()<<std::endl;
+    //OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<bd<<"), index="<<bd->getBufferIndex()<<" size= "<<_bufferDataList.size()<<std::endl;
 
     if (!bd || bd->getBufferObject()!=this) return;
 
@@ -1355,8 +1355,13 @@ unsigned int BufferObject::computeRequiredBufferSize() const
         ++itr)
     {
         BufferData* bd = *itr;
-        newTotalSize += bd->getTotalDataSize();
+        if (bd) newTotalSize += bd->getTotalDataSize();
+        else
+        {
+            OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::BufferObject::computeRequiredBufferSize() error, BufferData is 0x0"<<std::endl;
+        }
     }
+    //OSG_NOTICE<<"BufferObject::"<<this<<":"<<className()<<"::BufferObject::computeRequiredBufferSize() size="<<newTotalSize<<std::endl;
     return newTotalSize;
 }
 
@@ -1527,7 +1532,7 @@ PixelBufferObject::PixelBufferObject(osg::Image* image):
 
     OSG_INFO<<"Constructing PixelBufferObject for image="<<image<<std::endl;
 
-    setBufferData(0, image);
+    if (image) setBufferData(0, image);
 }
 
 PixelBufferObject::PixelBufferObject(const PixelBufferObject& buffer,const CopyOp& copyop):