Fixed too broad exception catch