Catch more errors in case we're fed garbage through API calls

Don't hang or crash, that's bad.

Change-Id: I77114c20fe2431718eda8dbefde1c390fe8283d4
2 files changed