diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index dde47b6..b300f93 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -29,10 +29,16 @@
     assign_params.delete(:logo)
     
     respond_to do |format|
-      if @organisation.update_attributes(assign_params)
-        format.html { redirect_to admin_show_organisation_path(params[:id]), notice: I18n.t("admin.org_updated_message")  }
-      else
-        format.html { render action: "edit" }
+      begin
+        if @organisation.update_attributes(assign_params)
+          format.html { redirect_to admin_show_organisation_path(params[:id]), notice: I18n.t("admin.org_updated_message")  }
+        else
+          format.html { render action: "edit" }
+        end
+        
+      rescue Dragonfly::Job::Fetch::NotFound => dflye
+        flash[:notice] = I18n.t("admin.org_bad_logo")
+        format.html {render action: "admin_edit"}
       end
     end
   end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 62e3814..bff48b9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -47,6 +47,7 @@
     org_parent: "Übergeordnete Organisation"
     org_created_message: "Organisation wurde erfolgreich angelegt."
     org_updated_message: "Organisation wurde erfolgreich aktualisiert."
+    org_bad_logo: "Es scheint ein Problem mit unserem Logo zu sein. Bitte laden Sie es erneut."
     plans: "Pläne"
     title: "Titel"
     desc: "Beschreibung"
diff --git a/config/locales/en-UK.yml b/config/locales/en-UK.yml
index e8af5c4..e198016 100644
--- a/config/locales/en-UK.yml
+++ b/config/locales/en-UK.yml
@@ -55,6 +55,7 @@
     org_parent: "Parent organisation"
     org_created_message: "Organisation was successfully created."
     org_updated_message: "Organisation was successfully updated."
+    org_bad_logo: "There seems to be a problem with your logo. Please upload it again."
     plans: "Plans"
     title: "Title"
     desc: "Description"
diff --git a/config/locales/en-US.yml b/config/locales/en-US.yml
index 4a37ec2..bfe6d70 100644
--- a/config/locales/en-US.yml
+++ b/config/locales/en-US.yml
@@ -49,6 +49,7 @@
     org_parent: "Parent organization"
     org_created_message: "Organization was successfully created."
     org_updated_message: "Organization was successfully updated."
+    org_bad_logo: "There seems to be a problem with your logo. Please upload it again."
     plans: "Plans"
     title: "Title"
     desc: "Description"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c824136..db8e07b 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -54,6 +54,7 @@
     org_parent: "Organisme d'attache"
     org_created_message: " L'organisme a été créé avec succès."
     org_updated_message: " L'organisme a bien été mis à jour."
+    org_bad_logo: "Il semble y avoir un problème avec notre logo. S'il vous plaît télécharger à nouveau."
     plans: "Plans"
     title: "Titre"
     desc: "Description"