Merge pull request #516 from rloomans/edit-labelset

Fix crash with "Undefined variable: esrow" when creating a label set. I review some part to be sure we can remove this test.

Thanks :)