#23: Fix NPE when renaming a set