diff --git a/rtengine/pipettebuffer.cc b/rtengine/pipettebuffer.cc
index 34a52a5c0..4ad8afad1 100644
--- a/rtengine/pipettebuffer.cc
+++ b/rtengine/pipettebuffer.cc
@@ -176,9 +176,11 @@ void PipetteBuffer::getPipetteData(int x, int y, const int squareSize)
         }
     }
 
-    dataProvider->setPipetteVal1(-1.f);
-    dataProvider->setPipetteVal2(-1.f);
-    dataProvider->setPipetteVal3(-1.f);
+    if (dataProvider) {
+        dataProvider->setPipetteVal1(-1.f);
+        dataProvider->setPipetteVal2(-1.f);
+        dataProvider->setPipetteVal3(-1.f);
+    }
 }
 
 }
diff --git a/rtgui/rgbcurves.cc b/rtgui/rgbcurves.cc
index 560ee7e57..81d997add 100644
--- a/rtgui/rgbcurves.cc
+++ b/rtgui/rgbcurves.cc
@@ -23,7 +23,7 @@
 using namespace rtengine;
 using namespace rtengine::procparams;
 
-RGBCurves::RGBCurves () : FoldableToolPanel(this, "rgbcurves", M("TP_RGBCURVES_LABEL"), false, true)
+RGBCurves::RGBCurves () : FoldableToolPanel(this, "rgbcurves", M("TP_RGBCURVES_LABEL"), false, true), lastLumamode(false)
 {
 
     lumamode = Gtk::manage (new Gtk::CheckButton (M("TP_RGBCURVES_LUMAMODE")));
diff --git a/rtgui/rtimage.cc b/rtgui/rtimage.cc
index 593ac95df..3fdf743f5 100644
--- a/rtgui/rtimage.cc
+++ b/rtgui/rtimage.cc
@@ -39,8 +39,6 @@ RTImage::RTImage () {}
 
 RTImage::RTImage (RTImage &other) : surface(other.surface), pixbuf(other.pixbuf)
 {
-    dpiBack = other.dpiBack;
-    scaleBack = other.scaleBack;
     if (pixbuf) {
         set(pixbuf);
     } else if (surface) {
diff --git a/rtgui/rtscalable.cc b/rtgui/rtscalable.cc
index aaa10bd21..079ece8d2 100644
--- a/rtgui/rtscalable.cc
+++ b/rtgui/rtscalable.cc
@@ -220,7 +220,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadImage(const Glib::ustring &fn
     GError **error = nullptr;
     RsvgHandle *handle = rsvg_handle_new_from_data((unsigned const char*)updatedSVG.c_str(), updatedSVG.length(), error);
 
-    if (handle == nullptr) {
+    if (error && !handle) {
         std::cerr << "ERROR: Can't use the provided data for \"" << fname << "\" to create a RsvgHandle:" << std::endl
                   << Glib::ustring((*error)->message) << std::endl;
         Cairo::RefPtr<Cairo::ImageSurface> surf = Cairo::ImageSurface::create(Cairo::FORMAT_RGB24, 10, 10);