2013-01-15 - Jonathan Morgan - changed so can handle None passed in.