commit 90a480b4684f624928dbb5b6bb96ca0e9947b203
Author: SebastianDiel <sebastian.diel@web.de>
Date:   Sat Oct 17 13:51:38 2015 +0200

    fix
    
    Conflicts:
            src/entitymanager.cpp

diff --git a/src/entitymanager.cpp b/src/entitymanager.cpp
index 987ab89..5f1a4d5 100644
--- a/src/entitymanager.cpp
+++ b/src/entitymanager.cpp
@@ -380,10 +380,10 @@ bool EntityManager::hasChanged(QSharedPointer<Entity> &entity) {
                     this->schema->getQueryBuilder()->columnNameIDAppendix();
                 QString relKey = i.key();
                 QVariant v = entity->getProperty(relKey.remove(relKey.size() - appendix.size(),
-                                                 appendix.size()));
-                if (!v.isNull()) {
-                    auto entity = EntityInstanceFactory::castQVariant(v);
-                    if (entity->getProperty(entity->getPrimaryKey()) != i.value()) {
+                                                               appendix.size()));
+                if (v.isValid() && !v.isNull()) {
+                    auto e = EntityInstanceFactory::castQVariant(v);
+                    if (e->getProperty(entity->getPrimaryKey()) != i.value()) {
                         changed = true;
                         break;
                     }