1 files changed, 6 insertions, 1 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 09d0c52..07bbbac 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -43,7 +43,12 @@ class NodesController < ApplicationController
   end
 
   def edit
-    @draft = @node.find_or_create_draft( current_user )
+    begin
+      @draft = @node.find_or_create_draft( current_user )
+    rescue LockedByAnotherUser
+      flash[:error] = "Page is locked by another user who is working on it!"
+      redirect_to :back
+    end
   end
 
   def update