Make exceptions more specific, catch less generic exceptions

As dictated per AOSP code style guidelines (more to come)