diff --git a/YACReaderLibrary/server/lib/httpserver/httprequest.cpp b/YACReaderLibrary/server/lib/httpserver/httprequest.cpp
index 0939bd47..efbf686b 100644
--- a/YACReaderLibrary/server/lib/httpserver/httprequest.cpp
+++ b/YACReaderLibrary/server/lib/httpserver/httprequest.cpp
@@ -460,16 +460,23 @@ void HttpRequest::parseMultiPartFile()
                 else if (!fileName.isEmpty() && !fieldName.isEmpty())
                 {
                     // last field was a file
-                    #ifdef SUPERVERBOSE
-                        qDebug("HttpRequest: finishing writing to uploaded file");
-                    #endif
-                    uploadedFile->resize(uploadedFile->size()-2);
-                    uploadedFile->flush();
-                    uploadedFile->seek(0);
-                    parameters.insert(fieldName,fileName);
-                    qDebug("HttpRequest: set parameter %s=%s",fieldName.data(),fileName.data());
-                    uploadedFiles.insert(fieldName,uploadedFile);
-                    qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size());
+                    if (uploadedFile)
+                    {
+                        #ifdef SUPERVERBOSE
+                            qDebug("HttpRequest: finishing writing to uploaded file");
+                        #endif
+                        uploadedFile->resize(uploadedFile->size()-2);
+                        uploadedFile->flush();
+                        uploadedFile->seek(0);
+                        parameters.insert(fieldName,fileName);
+                        qDebug("HttpRequest: set parameter %s=%s",fieldName.data(),fileName.data());
+                        uploadedFiles.insert(fieldName,uploadedFile);
+                        qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size());
+                    }
+                    else
+                    {
+                        qWarning("HttpRequest: format error, unexpected end of file data");
+                    }
                 }
                 if (line.contains(boundary+"--"))
                 {
@@ -546,4 +553,3 @@ QHostAddress HttpRequest::getPeerAddress() const
 {
     return peerAddress;
 }
-
diff --git a/YACReaderLibrary/server/lib/logging/filelogger.cpp b/YACReaderLibrary/server/lib/logging/filelogger.cpp
index 3e027bc2..a30acd85 100644
--- a/YACReaderLibrary/server/lib/logging/filelogger.cpp
+++ b/YACReaderLibrary/server/lib/logging/filelogger.cpp
@@ -92,8 +92,8 @@ void FileLogger::write(const LogMessage* logMessage)
         // Check for success
         if (file->error())
         {
-            close();
             qWarning("Cannot write to log file %s: %s",qPrintable(fileName),qPrintable(file->errorString()));
+            close();
         }
 
     }