Fix for bugs 1067404 and 1109646

Bug 1067404: Handling additional storage correctly at the group level
Bug 1109646: dup was being called on nil