Handle None initial values more robustly.

Signed-off-by: Antoine Catton <acatton@fusionbox.com>