diff --git a/module_build_service/auth.py b/module_build_service/auth.py
index 2fb2ee35..41448714 100644
--- a/module_build_service/auth.py
+++ b/module_build_service/auth.py
@@ -116,5 +116,11 @@ def get_user(request):
         log.exception(error)
         raise Unauthorized(error)
 
-    groups = set(extended_data['groups'])
+    try:
+        groups = set(extended_data['groups'])
+    except Exception as e:
+        error = "Could not find groups in UserInfo from OIDC %s" % str(e)
+        log.exception(extended_data)
+        raise Unauthorized(error)
+
     return data["username"], groups