Improved handling of inputs that don't have a value