Fixes #8417 - Correctly focus on errors in puppet form