Better exception handing.