Adding that error handling needs to be improved.