Don't catch innapropriate AttributeError

(cherry picked from commit f10d162b02cb552f0d1addcdacca71d3a705ebe4)
Version 1.0.1