diff --git a/lib/behat/behat_field_manager.php b/lib/behat/behat_field_manager.php
index d2e8c7f7dde..dd22b0bbab6 100644
--- a/lib/behat/behat_field_manager.php
+++ b/lib/behat/behat_field_manager.php
@@ -54,10 +54,15 @@ class behat_field_manager {
         try {
             // The DOM node.
             $fieldnode = $context->find_field($label);
-        } catch (ElementNotFoundException $e) {
+        } catch (ElementNotFoundException $fieldexception) {
 
             // Looking for labels that points to filemanagers.
-            $fieldnode = $context->find_filemanager($label);
+            try {
+                $fieldnode = $context->find_filemanager($label);
+            } catch (ElementNotFoundException $filemanagerexception) {
+                // We want the generic 'field' exception.
+                throw $fieldexception;
+            }
         }
 
         // The behat field manager.