I've attached a new version of 466-0-4.patch over in Jira that should
fix the last traceback you pastebinned.

-Jonathan