#554838 by Dave Reid, savlis: Fixed phantom menu items and block errors on module disable or uninstall.