catch more
do not add empty categories
use commitsafe version to catch illegalstateexception
no need to dismiss is activity no longer exists
fixes #158