handle non-required fields better