Get rid of 500 errors