Merge "Rewrite infuseOrNull to not suppress useful errors"