mod - refactor _configure.

Change-Id: I28f386f6fd1afce7fb66ba05a31ed1088132623a
mod - remove lock if tagging fails in start.

Change-Id: If4b94c1276124ec81d4603613b855f82692ec0d1