diff --git a/rfb/ScaledPixelBuffer.cxx b/rfb/ScaledPixelBuffer.cxx
index 932221d..1ed7a5c 100644
--- a/rfb/ScaledPixelBuffer.cxx
+++ b/rfb/ScaledPixelBuffer.cxx
@@ -39,8 +39,12 @@
   data = new U8[width_ * height_ * 4];
 }
 
+ScaledPixelBuffer::ScaledPixelBuffer() 
+  : src_data(0), src_width(0), src_height(0), scale_ratio(1), bpp(32), data(0) {
+}
+
 ScaledPixelBuffer::~ScaledPixelBuffer() {
-  delete [] data;
+  if (data) delete [] data;
 }
 
 const U8* ScaledPixelBuffer::getPixelsR(const Rect& r, int* stride) {
@@ -73,7 +77,7 @@
     width_  = (int)ceil(src_width  * scale_ratio);
     height_ = (int)ceil(src_height * scale_ratio);
 
-    delete [] data;
+    if (data) delete [] data;
     data = new U8[width_ * height_ * 4];
 
     scaleRect(Rect(0, 0, width_, height_));
diff --git a/rfb/ScaledPixelBuffer.h b/rfb/ScaledPixelBuffer.h
index 05a419d..723ce6e 100644
--- a/rfb/ScaledPixelBuffer.h
+++ b/rfb/ScaledPixelBuffer.h
@@ -32,6 +32,7 @@
   class ScaledPixelBuffer {
   public:
     ScaledPixelBuffer(U8 *data, int width, int height, int scale);
+    ScaledPixelBuffer();
     virtual ~ScaledPixelBuffer();
 
     // Get width, height, number of pixels and scale