Issue #6021: improve error and variable handling
Issue #6021: improve error and variable handling

rnveach/checkstyle,romani/checkstyle,romani/checkstyle,rnveach/checkstyle,checkstyle/checkstyle,rnveach/checkstyle,checkstyle/checkstyle,checkstyle/checkstyle,rnveach/checkstyle,checkstyle/checkstyle,romani/checkstyle,romani/checkstyle,rnveach/checkstyle,romani/checkstyle,checkstyle/checkstyle,rnveach/checkstyle,checkstyle/checkstyle,romani/checkstyle