Modified nullptr check...