Fix XCode 4 compilation problems with @try/@catch constructs + potential notifications timing bug.