Improved error handling, added background color for secondary data sources