update error handling

Change-Id: I061c057ba65058a76ac8697683572c9ec9c89059
gradle updates

Change-Id: Iafd1a474ffcae945aa53b9fbbf24d338b60d57b2
fix searches

Change-Id: I5b305575563391d91e817f89b09c1a6bb038b67c