Revert "Revert "Menu catch possible exceptions""

This reverts commit 3a49ac803581da72456c52885af48c8815e39672.