UI NullReferenceException fixed (thanks, Zettan!)