diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index 87c6fc4aa..1bb70690e 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -110,6 +110,7 @@ public class HttpUploadConnection implements Transferable {
 		try {
 			pair = AbstractConnectionManager.createInputStream(file, true);
 		} catch (FileNotFoundException e) {
+			Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not find file to upload - "+e.getMessage());
 			fail();
 			return;
 		}
@@ -129,15 +130,14 @@ public class HttpUploadConnection implements Transferable {
 							if (!canceled) {
 								new Thread(new FileUploader()).start();
 							}
+							return;
 						} catch (MalformedURLException e) {
-							fail();
+							//fall through
 						}
-					} else {
-						fail();
 					}
-				} else {
-					fail();
 				}
+				Log.d(Config.LOGTAG,account.getJid().toString()+": invalid response to slot request "+packet);
+				fail();
 			}
 		});
 		message.setTransferable(this);
@@ -203,6 +203,7 @@ public class HttpUploadConnection implements Transferable {
 
 							@Override
 							public void error(int errorCode, Message object) {
+								Log.d(Config.LOGTAG,"pgp encryption failed");
 								fail();
 							}