Fail properly when a content file is not found
Merge remote-tracking branch 'potatoesmaster/1071'