Merge pull request #1272 from am11/master

ProjectHelpers: Don't choke on NIE (#1257)
JSON: Support multiple file matches
Code: Prevent from NullReferenceException.(#1190)