handle keycloak 500 response
small polish on endpoint processing
Merge branch 'keycloak'