Fail a little more gracefully on John 7 & 8

Refs #15