fix python tracebacks
merge