First step to better error handling