Hand apply 5e96dbee6de3b4baf82083e5c7169f27e6051c5b from master; give a nicer error...