Better handle some errors with backgrounds
Added tag VERSION_4.1 for changeset a91acadfb6c2