1 files changed, 18 insertions, 9 deletions
diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex
index 026672ad1..36430a3fa 100644
--- a/lib/pleroma/web/xml/xml.ex
+++ b/lib/pleroma/web/xml/xml.ex
@@ -2,26 +2,35 @@ defmodule Pleroma.Web.XML do
   require Logger
 
   def string_from_xpath(_, :error), do: nil
+
   def string_from_xpath(xpath, doc) do
-    {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
+    try do
+      {:xmlObj, :string, res} = :xmerl_xpath.string('string(#{xpath})', doc)
 
-    res = res
-    |> to_string
-    |> String.trim
+      res =
+        res
+        |> to_string
+        |> String.trim()
 
-    if res == "", do: nil, else: res
+      if res == "", do: nil, else: res
+    catch
+      _e ->
+        Logger.debug("Couldn't find xpath #{xpath} in XML doc")
+        nil
+    end
   end
 
   def parse_document(text) do
     try do
-      {doc, _rest} = text
-      |> :binary.bin_to_list
-      |> :xmerl_scan.string
+      {doc, _rest} =
+        text
+        |> :binary.bin_to_list()
+        |> :xmerl_scan.string()
 
       doc
     catch
       :exit, _error ->
-        Logger.debug("Couldn't parse xml: #{inspect(text)}")
+        Logger.debug("Couldn't parse XML: #{inspect(text)}")
         :error
     end
   end