Robert Vesse - 2011-09-13

Patch for NullReferenceException