Change behavior in case of missing field, fixes #1