Fixed != null check