Fix 500 page, better nil catches on map