Fixed a potential crash cause & updated UA