Handle missing custom event/datasource information better. Fixes #1661