Merge "Improve error validation in the patch wizard"