improved logging; return error if content-type cannot be handled, instead of ending up in a loop