merge fix for core dump when called with no args from 2.2