2 files changed, 6 insertions, 6 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 59a9d7c..92ecc12 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -4,11 +4,11 @@ class Node < ApplicationRecord
 
   # Associations
   has_many    :pages, -> { order("revision ASC") }, :dependent => :destroy
-  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id, :dependent => :destroy
-  belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id, :dependent => :destroy
+  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id, :dependent => :destroy, optional: true
+  belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id, :dependent => :destroy, optional: true
   has_many    :permissions, :dependent => :destroy
   has_one     :event, :dependent => :destroy
-  belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id
+  belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id, optional: true
 
   # Callbacks
   after_create  :initialize_empty_page
diff --git a/app/models/page.rb b/app/models/page.rb
index ca3a8be..67db50a 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -12,9 +12,9 @@ class Page < ApplicationRecord
   translates :title, :abstract, :body # Globalize2
 
   # Associations
-  belongs_to :node
-  belongs_to :user
-  belongs_to :editor, :class_name => "User"
+  belongs_to :node, optional: true
+  belongs_to :user, optional: true
+  belongs_to :editor, :class_name => "User", optional: true
   has_many   :related_assets
   has_many   :assets, -> { order("position ASC") }, :through => :related_assets