diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index e13158eac..9dca1ac06 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -363,6 +363,8 @@ bool DatabaseTabWidget::saveDatabase(Database* db)
             emit messageDismissTab();
             return true;
         } else {
+            dbStruct.modified = true;
+            updateTabName(db);
             emit messageTab(tr("Writing the database failed.").append("\n").append(errorMessage),
                             MessageWidget::Error);
             return false;
diff --git a/src/keys/YkChallengeResponseKey.cpp b/src/keys/YkChallengeResponseKey.cpp
index cfb4a1dfe..4c77e7670 100644
--- a/src/keys/YkChallengeResponseKey.cpp
+++ b/src/keys/YkChallengeResponseKey.cpp
@@ -50,7 +50,7 @@ QByteArray YkChallengeResponseKey::rawKey() const
  */
 bool YkChallengeResponseKey::challenge(const QByteArray& challenge)
 {
-    return this->challenge(challenge, 1);
+    return this->challenge(challenge, 2);
 }
 
 bool YkChallengeResponseKey::challenge(const QByteArray& challenge, unsigned retries)
@@ -70,8 +70,8 @@ bool YkChallengeResponseKey::challenge(const QByteArray& challenge, unsigned ret
 
         QEventLoop loop;
         QFutureWatcher<YubiKey::ChallengeResult> watcher;
-        watcher.setFuture(future);
         connect(&watcher, SIGNAL(finished()), &loop, SLOT(quit()));
+        watcher.setFuture(future);
         loop.exec();
 
         if (m_blocking) {
diff --git a/src/keys/drivers/YubiKey.cpp b/src/keys/drivers/YubiKey.cpp
index 6fb44ec89..b6f0d3098 100644
--- a/src/keys/drivers/YubiKey.cpp
+++ b/src/keys/drivers/YubiKey.cpp
@@ -154,7 +154,7 @@ YubiKey::ChallengeResult YubiKey::challenge(int slot, bool mayBlock, const QByte
     QByteArray paddedChallenge = challenge;
 
     // ensure that YubiKey::init() succeeded
-    if (m_yk == NULL) {
+    if (!init()) {
         m_mutex.unlock();
         return ERROR;
     }