I went for the "dumb fix" as I couldn't test this error condition in vivo.