Remove nasty try except