clean up a bit.  ensure errors are thrown.  validate drop