Error message propagation improvements Fixes #66