Add error handling and test to list.