Split/add and fixes

This error will be thrown before any data is deleted, since the keys are created first. Is that ok?