Error-handling fix.
Merge branch '0.9.x'