Update: Included better null checking. #163

Closed YeGaSoft closed 3 years ago