Adding error handling to the wrapper
Cosmetic
Cosmetic