#21 - better error handling
#21 - better error handling
#21 - better error handling