Added 404 + safer method