Mediator content type check

Fixes #225 

Skipping CR as this is just a 2-line fix. Post commit comments welcome!

cc @rcrichton