diff --git a/easybuild/easyblocks/generic/bundle.py b/easybuild/easyblocks/generic/bundle.py
index 2571df7f32..9d9cfd6735 100644
--- a/easybuild/easyblocks/generic/bundle.py
+++ b/easybuild/easyblocks/generic/bundle.py
@@ -340,6 +340,9 @@ def make_module_req_guess(self):
             self.log.info("Gathering module paths for component %s v%s", cfg['name'], cfg['version'])
             reqs = comp.make_module_req_guess()
 
+            # Try-except block to fail with an easily understandable error message.
+            # This should only trigger when an EasyBlock returns non-dict module requirements
+            # for make_module_req_guess() which should then be fixed the components EasyBlock.
             try:
                 for key, value in sorted(reqs.items()):
                     if isinstance(value, string_type):