lib/avm/entries/entry.rb in avm-0.86.2 vs lib/avm/entries/entry.rb in avm-0.87.0

@@ -56,10 +56,15 @@
       end
 
       private
 
       def context_entry
-        ::EacConfig::Node.context.current.entry(full_path)
+        current_node = ::EacConfig::Node.context.optional_current
+        return current_node.entry(full_path) if current_node.present?
+
+        ::Avm::Entries::Entry::NoContextEntry.new
       end
+
+      require_sub __FILE__
     end
   end
 end