diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
index d9927954115..f8c4a9ce7c5 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
@@ -48,7 +48,7 @@
     <string name="getting_competitor">Hole Teilnehmer-Daten..</string>
     <string name="error">Fehler</string>
     <string name="error_could_not_complete_operation_on_server_try_again">Konnte Operation nicht durchführen. Bitte versuchen Sie es noch einmal.</string>
-    <string name="error_sending_team_image_to_server">Fehler: Konnte team-foto nicht an den server schicken.</string>
+    <string name="error_sending_team_image_to_server">Fehler: Konnte Team-Foto nicht an den server senden.</string>
     <string name="regatta_starts_in">Regatta beginnt in:</string>
     <string name="hours">Stunden</string>
     <string name="minute">Minute</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
index 49127597a7e..43c1853ee11 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
@@ -33,6 +33,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.sap.sailing.android.shared.data.http.HttpJsonPostRequest;
 import com.sap.sailing.android.shared.logging.ExLog;
@@ -356,12 +357,19 @@ public class RegattaActivity extends BaseActivity {
 				}
 			} catch (IOException e) {
 				ExLog.e(RegattaActivity.this, TAG, "Error uploading image: " + e.getLocalizedMessage());
-				e.printStackTrace();
 				this.cancel(true);
 			}
 
 			return "";
 		}
+		
+		@Override
+		protected void onCancelled() {
+			super.onCancelled();
+			Toast.makeText(RegattaActivity.this,
+					getString(R.string.error_sending_team_image_to_server),
+					Toast.LENGTH_LONG).show();
+		}
 
 		protected void onPostExecute(String  result) {
 			// do something