Add null handling to input forms