[merge] different return code for internal errors

[John Arbash Meinel]

John Arbash Meinel has voted tweak.
Status is now: Conditionally approved
Comment:
I'm happy with the change, but your comment makes it sound like you 
can't merge this until you fix those tests, right?

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3Ce01316480708160100l2469760s216e42071767b213%40mail.gmail.com%3E