Merge "Propagate exceptions correctly"