diff --git a/src/presentation/applicationmodel.h b/src/presentation/applicationmodel.h
index 773fdff0..89e3d4c0 100644
--- a/src/presentation/applicationmodel.h
+++ b/src/presentation/applicationmodel.h
@@ -1,80 +1,81 @@
 /* This file is part of Zanshin
 
    Copyright 2014 Kevin Ottens <ervin@kde.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of
    the License or (at your option) version 3 or any later version
    accepted by the membership of KDE e.V. (or its successor approved
    by the membership of KDE e.V.), which shall act as a proxy
    defined in Section 14 of version 3 of the license.
 
    This program 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 General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.
 */
 
 
 #ifndef PRESENTATION_APPLICATIONMODEL_H
 #define PRESENTATION_APPLICATIONMODEL_H
 
 #include <QObject>
 
 #include "domain/datasourcerepository.h"
 #include "domain/datasourcequeries.h"
 #include "domain/noterepository.h"
 #include "domain/taskrepository.h"
 
 #include "presentation/metatypes.h"
 
 namespace Presentation {
 
 class AvailablePagesModelInterface;
 class ErrorHandler;
 
 class ApplicationModel : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QObject* availableSources READ availableSources)
     Q_PROPERTY(QObject* availablePages READ availablePages)
     Q_PROPERTY(QObject* currentPage READ currentPage WRITE setCurrentPage NOTIFY currentPageChanged)
     Q_PROPERTY(QObject* editor READ editor)
+    Q_PROPERTY(Presentation::ErrorHandler* errorHandler READ errorHandler WRITE setErrorHandler)
 public:
     typedef QSharedPointer<ApplicationModel> Ptr;
 
     explicit ApplicationModel(QObject *parent = Q_NULLPTR);
     ~ApplicationModel();
 
     QObject *availableSources();
     QObject *availablePages();
     QObject *currentPage();
     QObject *editor();
 
     ErrorHandler *errorHandler() const;
 
 public slots:
     void setCurrentPage(QObject *page);
     void setErrorHandler(ErrorHandler *errorHandler);
 
 signals:
     void currentPageChanged(QObject *page);
 
 private:
     QObjectPtr m_availableSources;
     QObjectPtr m_availablePages;
     QObjectPtr m_currentPage;
     QObjectPtr m_editor;
 
     ErrorHandler *m_errorHandler;
 };
 
 }
 
 #endif // PRESENTATION_APPLICATIONMODEL_H
diff --git a/src/presentation/errorhandler.h b/src/presentation/errorhandler.h
index 101448a1..5c2eeed6 100644
--- a/src/presentation/errorhandler.h
+++ b/src/presentation/errorhandler.h
@@ -1,48 +1,51 @@
 /* This file is part of Zanshin
 
    Copyright 2014 Mario Bensi <mbensi@ipsquad.net>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of
    the License or (at your option) version 3 or any later version
    accepted by the membership of KDE e.V. (or its successor approved
    by the membership of KDE e.V.), which shall act as a proxy
    defined in Section 14 of version 3 of the license.
 
    This program 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 General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
    USA.
 */
 
 #ifndef PRESENTATION_ERRORHANDLER_H
 #define PRESENTATION_ERRORHANDLER_H
 
+#include <QMetaType>
 #include <QString>
 
 class KJob;
 
 namespace Presentation {
 
 class ErrorHandler
 {
 public:
     virtual ~ErrorHandler();
 
     void installHandler(KJob *job, const QString &message);
 
 private:
     void displayMessage(KJob *job, const QString &message);
 
     virtual void doDisplayMessage(const QString &message) = 0;
 };
 
 }
 
+Q_DECLARE_METATYPE(Presentation::ErrorHandler*)
+
 #endif // PRESENTATION_ERRORHANDLER_H