More verbose error logging
Merge branch '1.0.x'