Apollo: handle possible exceptions

Change-Id: Ie0f2496ccb3ec4d849fc9751ac682fe3b916a6bb
Merge branch 'cm-10.2' into martincz