returning empty containers instead of nulls

See issue #22 for reason.