Fix skipping node_group_id if not specified

Fixes: bug #1206252

Change-Id: I6a7516001d59d01528504bbe451279ce0bedc1f0