Fix two more fail -> panics
Fix the build
Merge pull request #289 from steveklabnik/fail_to_panic

Fail to panic & fix the build