WaterWave NPE Fix

If the user set the ChargeTime configuration option to 0 milliseconds
then it was possible for the user to get NullPointerExceptions.