Fixed #16137 - get_or_create should not require kwargs

Thanks wilfred@, poirier, and charettes for work
on the patch.