Removed nullptr dependency