Handle 'null' with defaults#19

whophi wants to merge 2 commits intotsoding:mastertsoding/jim:masterfrom

whophi:nullhandlingwhophi/jim:nullhandlingCopy head branch name to clipboard