Minor cleanup and don't conflate two different errors together.