PreBuild: Rescue from NullReferenceException.
ZenCoding: Updated with fixes for #568.
Merge pull request #571 from am11/master

PreBuild: Rescue from NullReferenceException