fixed rare npe
possible work around for notification bug