fixing taskmanager exception after migration is complete

fixes bug #1172478

Change-Id: Ic537ddc6a9405f1443c315697555060c0c1d1f73
Merge "fixing taskmanager exception after migration is complete"