[shortcut] update exception handling