Convert to PNotify 2.0 style
error handler
Merge branch 'pnotify2'