Fixed: Null check