if SP errormessage failes then print errormessage to browser

1 files changed, 14 insertions, 6 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 8e8863cbe..3a5026948 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -143,24 +143,32 @@ public class DispatcherServlet extends AuthServlet{
 										
 										//remove MOASession
 										AuthenticationSession moaSession = AuthenticationSessionStoreage.getSessionWithPendingRequestID(pendingRequestID);
-										AuthenticationManager.getInstance().performOnlyIDPLogOut(req, resp, moaSession.getSessionID());
+										if (moaSession != null)
+											AuthenticationManager.getInstance().performOnlyIDPLogOut(req, resp, moaSession.getSessionID());
 										
 										return;
+										
+									} else {
+										handleErrorNoRedirect(throwable.getMessage(), throwable,
+												req, resp);
+										
 									}
 								}
+								
 							} catch (Throwable e) {
 								Logger.error(e);
 								handleErrorNoRedirect(throwable.getMessage(),
 										throwable, req, resp);
 							}
-						}
-						else {
+							
+						} else {
 							handleErrorNoRedirect(throwable.getMessage(), throwable,
 									req, resp);
 						}
-					}
-					handleErrorNoRedirect(MOAIDMessageProvider.getInstance().getMessage("auth.26", null), 
-							null, req, resp);
+						
+					} else
+						handleErrorNoRedirect(MOAIDMessageProvider.getInstance().getMessage("auth.26", null), 
+								null, req, resp);
 					
 				return;
 			}