Added 500 handling