Add very basic error handling