Merge pull request #1266 from am11/master

Code: Uses DoNotWait to avoid crashes
Merge pull request #1267 from am11/master

Release: Version 2.2.4
ProjectHelpers: Don't choke on NIE. (#1257)