Shortcuts - Default handling

This will hopefully fix the nil error problem.