Added validation to drop()