Minor formatting, added a sanity check and a timeout for the DBus notification.