Merge pull request #1948 from alecchendev/custom-fail-back-err