diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp
index 23d99fb35..d38b433e7 100644
--- a/src/format/KeePass2Reader.cpp
+++ b/src/format/KeePass2Reader.cpp
@@ -74,6 +74,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
 
     if (realStart != m_streamStartBytes) {
         raiseError("4");
+        return 0;
     }
 
     HashedBlockStream hashedStream(&cipherStream);
diff --git a/src/keys/PasswordKey.cpp b/src/keys/PasswordKey.cpp
index b48e9186a..ce216c216 100644
--- a/src/keys/PasswordKey.cpp
+++ b/src/keys/PasswordKey.cpp
@@ -19,6 +19,15 @@
 
 #include "crypto/CryptoHash.h"
 
+PasswordKey::PasswordKey()
+{
+}
+
+PasswordKey::PasswordKey(const QString& password)
+{
+    setPassword(password);
+}
+
 QByteArray PasswordKey::rawKey() const
 {
     return m_key;
diff --git a/src/keys/PasswordKey.h b/src/keys/PasswordKey.h
index 259f1c825..6d32d560e 100644
--- a/src/keys/PasswordKey.h
+++ b/src/keys/PasswordKey.h
@@ -25,6 +25,8 @@
 class PasswordKey : public Key
 {
 public:
+    PasswordKey();
+    PasswordKey(const QString& password);
     QByteArray rawKey() const;
     void setPassword(const QString& password);
     PasswordKey* clone() const;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cbcdaf38a..41b1e6476 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -71,6 +71,9 @@ target_link_libraries( testgroup keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_L
 add_unit_test( testkeepass2xmlreader TestKeePass2XmlReader.cpp )
 target_link_libraries( testkeepass2xmlreader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} )
 
+add_unit_test( testkeepass2reader TestKeePass2Reader.cpp )
+target_link_libraries( testkeepass2reader keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} )
+
 add_unit_test( testgroupmodel TestGroupModel.cpp modeltest.cpp )
 target_link_libraries( testgroupmodel keepassx_core ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBGCRYPT_LIBS} )
 
diff --git a/tests/NonAscii.kdbx b/tests/NonAscii.kdbx
new file mode 100644
index 000000000..d4e4ec547
Binary files /dev/null and b/tests/NonAscii.kdbx differ
diff --git a/tests/TestKeePass2Reader.cpp b/tests/TestKeePass2Reader.cpp
new file mode 100644
index 000000000..840817826
--- /dev/null
+++ b/tests/TestKeePass2Reader.cpp
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
+ *
+ *  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 or (at your option)
+ *  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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtTest/QTest>
+
+#include "config-keepassx-tests.h"
+#include "core/Database.h"
+#include "core/Metadata.h"
+#include "crypto/Crypto.h"
+#include "format/KeePass2Reader.h"
+#include "keys/PasswordKey.h"
+
+class TestKeePass2Reader : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void testNonAscii();
+};
+
+void TestKeePass2Reader::initTestCase()
+{
+    Crypto::init();
+}
+
+void TestKeePass2Reader::testNonAscii()
+{
+    QString filename = QString(KEEPASSX_TEST_DIR).append("/NonAscii.kdbx");
+    CompositeKey key;
+    key.addKey(PasswordKey(QString::fromUtf8("\xce\x94\xc3\xb6\xd8\xb6")));
+    KeePass2Reader* reader = new KeePass2Reader();
+    Database* db = reader->readDatabase(filename, key);
+    QVERIFY(db);
+    QVERIFY(!reader->error());
+    QCOMPARE(db->metadata()->name(), QString("NonAsciiTest"));
+}
+
+QTEST_MAIN(TestKeePass2Reader);
+
+#include "TestKeePass2Reader.moc"