Don't request empty nodesets

Change-Id: I637d23800ddb189084e1965b9ead5092f289d4df
4 files changed