If gap handling is enabled, always use it

If gap handling has been enabled, always use a gap handler, don't do a data not found on a gap (unless it is the abort handler).