Fix: Dropping was going into infinite loop on empty database.
Mod: moved since to the end.