#935 - Add NPE guard, allow multi-case in TQRestriction