don't jump to python error
Merge remote-tracking branch 'sean_github/master'