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

Code: Uses DoNotWait to avoid crashes