diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -91,7 +91,11 @@ class OrganizationsController < ApplicationController
   end
 
   def destroy
-    if Organization.count > 1
+    if current_organization == @organization
+      errors [_("Could not delete organization '#{params[:id]}'."),  _("The current organization cannot be deleted. Please switch to a different organization before deleting.")]
+
+      render :text => "The current organization cannot be deleted. Please switch to a different organization before deleting.", :status=>:bad_request and return
+    elsif Organization.count > 1
       @id = @organization.id
       begin
         @organization.destroy
<I> - Enforced the  cant delete current org restriction on the controller side