Adding more robust Content-Type handling.