The fix in ID #2893665 caused a None reference decrease, causing Python Fatal errors when used too much.
Can you please resubmit this as a patch so that I can review it against head? Thanks much!
In the mean time, this was already added as a patch in
Thanks for the patch! On review I've decided to go with the patch from dbprice1 as I felt the patch to be better organized and it provided a test.