be more carefull with excepting TypeErrors
Merge remote-tracking branch 'origin/five' into five