Improve on the diagnostic in my last patch and change warning
to error. rdar://18768214.