diff --git a/plugins/pictureshape/PictureShapeConfigWidget.cpp b/plugins/pictureshape/PictureShapeConfigWidget.cpp
index a8f54539046..85bb1125728 100644
--- a/plugins/pictureshape/PictureShapeConfigWidget.cpp
+++ b/plugins/pictureshape/PictureShapeConfigWidget.cpp
@@ -1,110 +1,125 @@
 /* This file is part of the KDE project
  * Copyright (C) 2008 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "PictureShapeConfigWidget.h"
 #include "PictureShape.h"
 #include "PictureDebug.h"
 
 #include <KoImageData.h>
 #include <KoImageCollection.h>
 
 #include <kfilewidget.h>
-#include <kjob.h>
+#include <kjobuidelegate.h>
 #include <KIO/Job>
 
 #include <QGridLayout>
 #include <QImageReader>
 #include <QUrl>
 
-void LoadWaiter::setImageData(KJob *job)
+void PictureShapeLoadWaiter::setImageData(KJob *job)
 {
+    if (job->error()) { // e.g. file not found
+        job->uiDelegate()->showErrorMessage();
+        if (m_pictureShape && !m_pictureShape->imageData()) {
+            // Don't leave an empty broken shape, the rest of the code isn't ready for null imageData
+            if (m_pictureShape->parent()) {
+                m_pictureShape->parent()->removeShape(m_pictureShape);
+            }
+            delete m_pictureShape;
+        }
+        deleteLater();
+        return;
+    }
+
+    deleteLater();
+
     if (m_pictureShape == 0)
-        return; // ugh, the shape got deleted meanwhile
-        KIO::StoredTransferJob *transferJob = qobject_cast<KIO::StoredTransferJob*>(job);
+        return; // ugh, the shape got deleted meanwhile (## err, who would set the pointer to null?)
+
+    KIO::StoredTransferJob *transferJob = qobject_cast<KIO::StoredTransferJob*>(job);
     Q_ASSERT(transferJob);
 
     if (m_pictureShape->imageCollection()) {
         KoImageData *data = m_pictureShape->imageCollection()->createImageData(transferJob->data());
         if (data) {
             m_pictureShape->setUserData(data);
             // check if the shape still size of the default shape and resize in that case
             if (qFuzzyCompare(m_pictureShape->size().width(), 50.0)) {
                 m_pictureShape->setSize(data->imageSize());
             }
             // trigger repaint as the userData was changed
             m_pictureShape->update();
         }
     }
-    deleteLater();
 }
 
 // ---------------------------------------------------- //
 
 PictureShapeConfigWidget::PictureShapeConfigWidget()
     : m_shape(0),
     m_fileWidget(0)
 {
 }
 
 PictureShapeConfigWidget::~PictureShapeConfigWidget()
 {
     delete m_fileWidget;
 }
 
 void PictureShapeConfigWidget::open(KoShape *shape)
 {
     m_shape = dynamic_cast<PictureShape*>(shape);
     Q_ASSERT(m_shape);
     delete m_fileWidget;
     QVBoxLayout *layout = new QVBoxLayout(this);
     m_fileWidget = new KFileWidget(QUrl(/* QT5TODO:"kfiledialog:///OpenDialog"*/), this);
     m_fileWidget->setOperationMode(KFileWidget::Opening);
     QStringList imageFilters;
     // ## this is awful. Qt5: use m_fileWidget->setMimeFilter(QImageReader::supportedMimeTypes()) directly
     foreach(const QByteArray &format, QImageReader::supportedImageFormats()) {
         imageFilters << QString("image/") + format;
     }
     m_fileWidget->setMimeFilter(imageFilters);
     layout->addWidget(m_fileWidget);
     setLayout(layout);
     connect(m_fileWidget, SIGNAL(accepted()), this, SIGNAL(accept()));
 }
 
 void PictureShapeConfigWidget::save()
 {
     if (!m_shape)
         return;
     m_fileWidget->accept();
     QUrl url = m_fileWidget->selectedUrl();
     if (!url.isEmpty()) {
         KIO::StoredTransferJob *job = KIO::storedGet(url, KIO::NoReload, 0);
-        LoadWaiter *waiter = new LoadWaiter(m_shape);
+        PictureShapeLoadWaiter *waiter = new PictureShapeLoadWaiter(m_shape);
         connect(job, SIGNAL(result(KJob*)), waiter, SLOT(setImageData(KJob*)));
     }
 }
 
 bool PictureShapeConfigWidget::showOnShapeCreate()
 {
     return true;
 }
 
 bool PictureShapeConfigWidget::showOnShapeSelect()
 {
     return false;
 }
diff --git a/plugins/pictureshape/PictureShapeConfigWidget.h b/plugins/pictureshape/PictureShapeConfigWidget.h
index 14b59aaf749..a1fee6128f6 100644
--- a/plugins/pictureshape/PictureShapeConfigWidget.h
+++ b/plugins/pictureshape/PictureShapeConfigWidget.h
@@ -1,64 +1,64 @@
 /* This file is part of the KDE project
  * Copyright (C) 2008 Jan Hambrecht <jaham@gmx.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef PICTURESHAPECONFIGWIDGET_H
 #define PICTURESHAPECONFIGWIDGET_H
 
 #include <KoShapeConfigWidgetBase.h>
 #include <QWidget>
 
 class PictureShape;
 class KFileWidget;
 class KJob;
 
 class PictureShapeConfigWidget : public KoShapeConfigWidgetBase
 {
     Q_OBJECT
 public:
     PictureShapeConfigWidget();
     ~PictureShapeConfigWidget();
 
     /// reimplemented from KoShapeConfigWidgetBase
     virtual void open(KoShape *shape);
     /// reimplemented from KoShapeConfigWidgetBase
     virtual void save();
     /// reimplemented from KoShapeConfigWidgetBase
     virtual bool showOnShapeCreate();
     /// reimplemented from KoShapeConfigWidgetBase
     virtual bool showOnShapeSelect();
 
 private:
     PictureShape *m_shape;
     KFileWidget *m_fileWidget;
 };
 
-class LoadWaiter : public QObject
+class PictureShapeLoadWaiter : public QObject
 {
     Q_OBJECT
 public:
-    explicit LoadWaiter(PictureShape *shape) : m_pictureShape(shape) { }
+    explicit PictureShapeLoadWaiter(PictureShape *shape) : m_pictureShape(shape) { }
 
 public Q_SLOTS:
     void setImageData(KJob *job);
 
 private:
     PictureShape *m_pictureShape;
 };
 
 #endif //PICTURESHAPECONFIGWIDGET_H