diff --git a/.rubocop.yml b/.rubocop.yml
index b520263..c90af36 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -190,6 +190,8 @@ Style/NumericPredicate:
 # only with ruby >= 2.3
 Style/FrozenStringLiteralComment:
   Enabled: false
+Style/SafeNavigation:
+  Enabled: false
 
 # only with ruby >= 2.4
 Performance/RegexpMatch:
diff --git a/lib/diaspora_federation/discovery/h_card.rb b/lib/diaspora_federation/discovery/h_card.rb
index 17900fc..816127f 100644
--- a/lib/diaspora_federation/discovery/h_card.rb
+++ b/lib/diaspora_federation/discovery/h_card.rb
@@ -269,7 +269,8 @@ module DiasporaFederation
       end
 
       private_class_method def self.content_from_doc(doc, content_selector)
-        element_from_doc(doc, content_selector).try(:content)
+        element = element_from_doc(doc, content_selector)
+        element.content if element
       end
 
       private_class_method def self.photo_from_doc(doc, photo_selector)
diff --git a/lib/diaspora_federation/entities/relayable.rb b/lib/diaspora_federation/entities/relayable.rb
index cf0a2ad..7a06ddf 100644
--- a/lib/diaspora_federation/entities/relayable.rb
+++ b/lib/diaspora_federation/entities/relayable.rb
@@ -72,7 +72,7 @@ module DiasporaFederation
       # @param [Hash] additional_xml_elements additional xml elements
       # @see DiasporaFederation::Entity#initialize
       def initialize(data, xml_order=nil, additional_xml_elements={})
-        @xml_order = xml_order.try(:reject) {|name| name =~ /signature/ }
+        @xml_order = xml_order.reject {|name| name =~ /signature/ } if xml_order
         @additional_xml_elements = additional_xml_elements
 
         super(data)