- Try to prevent an NPE from origin data (Fixes #5905)