added handling of null/empty input values