Bug 548026: Fix unnecessary exceptions and report formatting

Change-Id: I940ba38ea589e1cbb6e9346dab7a96bde30a6bac
63 files changed