This should fix the problem of 404/500 if there is a problem