Add listener test
Use idiomatic repetitive error handling technique