Fix: Improved handling of missing entry's