add & modify (404/500) Error
change logic of 404/500 error