Fixed issues with parsing non JSON content