Not found errors are handled better. Promises shuffling.