@@ -276,21 +276,21 @@
  * @brief Returns the attribute with the specified name.
  *
  * @param attributeName The name of the attribute
  * @return The attribute with the specified name
  */
-- (OFXMLAttribute *)attributeForName: (OFString *)attributeName;
+- (nullable OFXMLAttribute *)attributeForName: (OFString *)attributeName;
 
 /*!
  * @brief Returns the attribute with the specified name and namespace.
  *
  * @param attributeName The name of the attribute
  * @param attributeNS The namespace of the attribute
  * @return The attribute with the specified name and namespace
  */
-- (OFXMLAttribute *)attributeForName: (OFString *)attributeName
-			   namespace: (nullable OFString *)attributeNS;
+- (nullable OFXMLAttribute *)attributeForName: (OFString *)attributeName
+				    namespace: (nullable OFString *)attributeNS;
 
 /*!
  * @brief Removes the attribute with the specified name.
  *
  * @param attributeName The name of the attribute
@@ -397,11 +397,11 @@
  * @brief Returns the first child element with the specified name.
  *
  * @param elementName The name of the element
  * @return The first child element with the specified name
  */
-- (OFXMLElement *)elementForName: (OFString *)elementName;
+- (nullable OFXMLElement *)elementForName: (OFString *)elementName;
 
 /*!
  * @brief Returns the child elements with the specified name.
  *
  * @param elementName The name of the elements
@@ -415,12 +415,12 @@
  *
  * @param elementName The name of the element
  * @param elementNS The namespace of the element
  * @return The first child element with the specified name and namespace
  */
-- (OFXMLElement *)elementForName: (OFString *)elementName
-		       namespace: (nullable OFString *)elementNS;
+- (nullable OFXMLElement *)elementForName: (OFString *)elementName
+				namespace: (nullable OFString *)elementNS;
 
 /*!
  * @brief Returns the child elements with the specified name and namespace.
  *
  * @param elementName The name of the elements