Surface all internal errors we don't handle

Also fix stupid typo.
THIS IS WHY YOU DO NOT SELF MERGE

Change-Id: I6fa7fa6d2672a40fe20a4aa8e61d0600e2440bbe