Merge "Bug 1292: Fix for NPE after notification get."