The decorator can't be used here because execution needs to continue after the exception is caught.

I've opted to use a constant to de-duplicate the error string which was used twice.  Applied in fix in b6ee03047b60377f054252375fe0f6fd16f4406a