diff --git a/libs/metadata/kis_meta_data_schema_registry.cc b/libs/metadata/kis_meta_data_schema_registry.cc
index c7a35a307c..faaff7a982 100644
--- a/libs/metadata/kis_meta_data_schema_registry.cc
+++ b/libs/metadata/kis_meta_data_schema_registry.cc
@@ -1,109 +1,111 @@
 /*
  *  Copyright (c) 2007,2009 Cyrille Berger <cberger@cberger.net>
  *
  *  This library is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published by
  *  the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser 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.
  */
 
 #include "kis_meta_data_schema_registry.h"
 
 #include <QString>
 
 
 #include <KoResourcePaths.h>
 
 #include "kis_debug.h"
 #include "kis_meta_data_schema_p.h"
 
 using namespace KisMetaData;
 
 // ---- Schema Registry ---- //
 
 struct Q_DECL_HIDDEN SchemaRegistry::Private {
     static SchemaRegistry *singleton;
     QHash<QString, Schema*> uri2Schema;
     QHash<QString, Schema*> prefix2Schema;
 };
 
 SchemaRegistry *SchemaRegistry::Private::singleton = 0;
 
 SchemaRegistry* SchemaRegistry::instance()
 {
     if (SchemaRegistry::Private::singleton == 0) {
         SchemaRegistry::Private::singleton = new SchemaRegistry();
     }
     return SchemaRegistry::Private::singleton;
 }
 
 SchemaRegistry::SchemaRegistry()
     : d(new Private)
 {
     KoResourcePaths::addResourceType("metadata_schema", "data", "/metadata/schemas/");
 
     QStringList schemasFilenames = KoResourcePaths::findAllResources("metadata_schema", "*.schema");
 
     Q_FOREACH (const QString& fileName, schemasFilenames) {
         Schema* schema = new Schema();
         schema->d->load(fileName);
         if (schemaFromUri(schema->uri())) {
             errMetaData << "Schema already exist uri: " << schema->uri();
+            delete schema;
         } else if (schemaFromPrefix(schema->prefix())) {
             errMetaData << "Schema already exist prefix: " << schema->prefix();
+            delete schema;
         } else {
             d->uri2Schema[schema->uri()] = schema;
             d->prefix2Schema[schema->prefix()] = schema;
         }
     }
 
     // DEPRECATED WRITE A SCHEMA FOR EACH OF THEM
     create(Schema::MakerNoteSchemaUri, "mkn");
     create(Schema::IPTCSchemaUri, "Iptc4xmpCore");
     create(Schema::PhotoshopSchemaUri, "photoshop");
 }
 
 SchemaRegistry::~SchemaRegistry()
 {
     delete d;
 }
 
 
 const Schema* SchemaRegistry::schemaFromUri(const QString & uri) const
 {
     return d->uri2Schema[uri];
 }
 
 const Schema* SchemaRegistry::schemaFromPrefix(const QString & prefix) const
 {
     return d->prefix2Schema[prefix];
 }
 
 const Schema* SchemaRegistry::create(const QString & uri, const QString & prefix)
 {
     // First search for the schema
     const Schema* schema = schemaFromUri(uri);
     if (schema) {
         return schema;
     }
     // Second search for the prefix
     schema = schemaFromPrefix(prefix);
     if (schema) {
         return 0; // A schema with the same prefix already exist
     }
     // The schema doesn't exist yet, create it
     Schema* nschema = new Schema(uri, prefix);
     d->uri2Schema[uri] = nschema;
     d->prefix2Schema[prefix] = nschema;
     return nschema;
 }