Point taken, will make sure we handle null values as we did before.