- add selective logging - fix handling of exceptions Change-Id: I7e2c2d4ed12302874c3bb2cc7bd707aa8e487341