More error handling, Captures more, Less dups