Fixed error handling required due to lack of demo data.