[API] Catch for_update locking issue

Change-Id: I296857f723d53bd0a5f4d847dde73a963d672aed