diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart
index c3348e8..eb8ec63 100644
--- a/lib/util/helpers.dart
+++ b/lib/util/helpers.dart
@@ -3,15 +3,18 @@ import 'dart:core';
 import 'package:intl/intl.dart';
 import 'package:xml/xml.dart';
 
-XmlElement? findElementOrNull(XmlElement element, String name, {String? namespace}) {
+XmlElement? findElementOrNull(XmlElement element, String name,
+    {String? namespace}) {
   try {
-    return element.findAllElements(name, namespace: namespace).first;
+    var result = element.findAllElements(name, namespace: namespace);
+    return result.isNotEmpty ? result.first : null;
   } on StateError {
     return null;
   }
 }
 
-List<XmlElement>? findAllDirectElementsOrNull(XmlElement element, String name, {String? namespace}) {
+List<XmlElement>? findAllDirectElementsOrNull(XmlElement element, String name,
+    {String? namespace}) {
   try {
     return element.findElements(name, namespace: namespace).toList();
   } on StateError {