CYB-148 - updated pull request, removing the 500 error and moving the 404 to the Angular 404 file