Adding another null check to prevent another crash
Adding another null check to prevent another crash