Fixed NullPointerException on Windows

A NullPointerException was occurring on Windows when referring to the OS X notification format. This is now fixed.
Merge remote-tracking branch 'origin/master'