Comment 12 for bug 1592841

Try this. I've fixed the new instance of the error as well. Incremented the version number so the patch has a different name, but you may not want to do that if you end up uploading