Fixed some none escaping

Fixed some none escaping