Render content-type appropriate 404 (bug 1089987)

Change-Id: I8d6acdaa7f8220341bca15cc4acba807910f6891