Catch more exceptions in constructors, close #22