Catching all exceptions when docking. am: f60a4af047
am: 5e04aeb328

* commit '5e04aeb328c941e8a06d21281068031bc59d1822':
  Catching all exceptions when docking.

Change-Id: Ib30bff6adda9728243ae1f63398101ec67b0d432