Reduce lodash dep and fix issue with nulls