Fixed to deal with 404's