Revert "Clean up error for claim index out of bounds"

This reverts commit 213745d86d5ba3a18c3232df111c88f47760d17c.

Change-Id: Ia6a9db094c2fc5f624fb32c3cf20180125081ce8
Merge "Revert "Clean up error for claim index out of bounds""