Added check for non-empty data in _rehijack() method