Error handling fixed (and improved)