Catching all exceptions when docking. am: f60a4af047
am: 7fea69c3b6

* commit '7fea69c3b6e5c2fbfa960d84a05a62390752ec30':

Change-Id: I523fa5b407673bc46ab0202841b8a0fbdea79e65