Need to account for server 500 errors