Merge branch 'master' into message_display_rework

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
index f28dee36..6c546fee 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
@@ -220,8 +220,12 @@ public class HttpUploadConnection implements Transferable {
 					fail();
 				}
 			} catch (IOException e) {
-                errorStream = connection.getErrorStream();
-                Logging.e("httpupload", "http response: " + new Scanner(errorStream).useDelimiter("\\A").next() + ", exception message: " + e.getMessage());
+                errorStream = (null != connection) ? connection.getErrorStream() : null;
+                String httpResponseMessage = null;
+                if (null != errorStream) {
+                    httpResponseMessage = new Scanner(errorStream).useDelimiter("\\A").next();
+                }
+                Logging.e("httpupload", ((null != httpResponseMessage) ? ("http response: " + httpResponseMessage + ", ") : "") + "exception message: " + e.getMessage());
 				fail();
 			} finally {
 				StreamUtil.close(os);