Hand apply 3e776856db5f722437ff0b841120400ee6f43e14 from master; better error on...