Just messing around some more with correct error handling