Merge

1 files changed, 7 insertions, 3 deletions

diff --git a/src/nxmaccessmanager.cpp b/src/nxmaccessmanager.cpp
index 08c16b62..ed872870 100644
--- a/src/nxmaccessmanager.cpp
+++ b/src/nxmaccessmanager.cpp
@@ -169,10 +169,14 @@ void NXMAccessManager::loginTimeout()
 void NXMAccessManager::loginError(QNetworkReply::NetworkError)
 {
   m_ProgressDialog.hide();
-  emit loginFailed(m_LoginReply->errorString());
   m_LoginTimeout.stop();
-  m_LoginReply->deleteLater();
-  m_LoginReply = NULL;
+  if (m_LoginReply != NULL) {
+    emit loginFailed(m_LoginReply->errorString());
+    m_LoginReply->deleteLater();
+    m_LoginReply = NULL;
+  } else {
+    emit loginFailed(tr("Unknown error"));
+  }
   m_Username.clear();
   m_Password.clear();
 }