qa: minor tweaks to 440, esp to deal with errors better
qa: minor tweaks to 440, esp to deal with errors better

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp