From fa26b97e3aa9d102f301b4ed58e33aad6bec34f9 Mon Sep 17 00:00:00 2001 From: Aditya Tiwari Date: Sun, 26 Apr 2026 06:49:25 +0000 Subject: [PATCH] WEB-933: Fix null dereference in ErrorHandlerInterceptor when defaultUserMessage is null --- .../core/http/error-handler.interceptor.ts | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/app/core/http/error-handler.interceptor.ts b/src/app/core/http/error-handler.interceptor.ts index c054015a9f..ea8033a9da 100644 --- a/src/app/core/http/error-handler.interceptor.ts +++ b/src/app/core/http/error-handler.interceptor.ts @@ -92,21 +92,19 @@ export class ErrorHandlerInterceptor implements HttpInterceptor { : nestedMessage : topLevelMessage; let parameterName: string | null = null; - if (response.error.errors) { - if (response.error.errors[0]) { - if ( - response.error.errors[0].userMessageGlobalisationCode && - this.databaseErrorCodes.indexOf(response.error.errors[0].userMessageGlobalisationCode) > -1 - ) { - errorMessage = this.translate.instant('errors.error.msg.data.integrity.issue'); - } else { - errorMessage = - response.error.errors[0].defaultUserMessage.replace(/\\./g, ' ') || - response.error.errors[0].developerMessage.replace(/\\./g, ' '); - } + if (errorBody?.errors?.[0]) { + const firstError = errorBody.errors[0]; + if ( + firstError.userMessageGlobalisationCode && + this.databaseErrorCodes.indexOf(firstError.userMessageGlobalisationCode) > -1 + ) { + errorMessage = this.translate.instant('errors.error.msg.data.integrity.issue'); + } else { + errorMessage = + firstError.defaultUserMessage?.replace(/\\./g, ' ') || firstError.developerMessage?.replace(/\\./g, ' '); } - if ('parameterName' in errorBody.errors[0]) { - parameterName = errorBody.errors[0].parameterName; + if ('parameterName' in firstError) { + parameterName = firstError.parameterName; } } const isClientImage404 = status === 404 && request.url.includes('/clients/') && request.url.includes('/images');