Clean up some inconsistent in error handling

It is more DRY to let the exception here bubble.