Added even more error checking to dc-migrate.

Change-Id: Ie383903f56eb578e0e4ff2a296ca807bdb4a2d17