Add some graceful error / missing feature handling.