diff --git a/timeless-api/src/main/webui/src/app/pages/sign/sign-up/sign-up.component.ts b/timeless-api/src/main/webui/src/app/pages/sign/sign-up/sign-up.component.ts
index 41c4dd2..b52310c 100644
--- a/timeless-api/src/main/webui/src/app/pages/sign/sign-up/sign-up.component.ts
+++ b/timeless-api/src/main/webui/src/app/pages/sign/sign-up/sign-up.component.ts
@@ -11,7 +11,7 @@ import { InputText } from 'primeng/inputtext';
 import { Router, RouterLink } from '@angular/router';
 import { FloatLabel } from 'primeng/floatlabel';
 import { TimelessApiService } from '../../../timeless-api.service';
-import { catchError } from 'rxjs';
+import { catchError, EMPTY } from 'rxjs';
 import { ToastService } from '../../../services/toast.service';
 
 @Component({
@@ -53,10 +53,10 @@ export class SignUpComponent {
         .signUp(this.form.value)
         .pipe(
           catchError((err: any) => {
-            if (err.error.message) {
+            if (err.error?.message) {
               this.toast.error('Conflito', err.error.message);
             }
-            return err;
+            return EMPTY;
           }),
         )
         .subscribe((_) => {
diff --git a/timeless-api/src/main/webui/src/app/token.interceptor.ts b/timeless-api/src/main/webui/src/app/token.interceptor.ts
index 5308ad4..2ff60e2 100644
--- a/timeless-api/src/main/webui/src/app/token.interceptor.ts
+++ b/timeless-api/src/main/webui/src/app/token.interceptor.ts
@@ -3,9 +3,9 @@ import { timelessLocalStorageKey } from './constants';
 
 const allowedPaths = [
   '/api/sign-in',
-  '/api/sign-out',
+  '/api/sign-up',
   'api/sign-in',
-  'api/sign-out',
+  'api/sign-up',
 ];
 
 export const tokenInterceptor: HttpInterceptorFn = (req, next) => {