Merge "API: Add block info to more block errors"