1 files changed, 5 insertions, 2 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
index a8b0a961..dce2251a 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
@@ -105,14 +105,17 @@ public class ProtocolFinalizationController extends AbstractController {
             if (pendingReq != null) {
               IModulInfo handlingModule = ProtocolAuthenticationService
                   .extractShibbolethHandling(pendingReq, applicationContext);
-
-              handlingModule.generateErrorMessage(throwable, req, resp, pendingReq);
+              if (!handlingModule.generateErrorMessage(throwable, req, resp, pendingReq)) {
+                protAuthService.handleErrorNoRedirect(new EaafException("process.90", null), req, resp, false);
+                
+              }              
             }
           }
         }
       } catch (Throwable e) {
         log.error(e.getMessage(), e);
         protAuthService.handleErrorNoRedirect(e, req, resp, false);
+        
       } finally {
         // remove pending-request
         if (pendingReq != null) {