Better handling of null and None

Do skip null and None even when a default exists, in case
the default happens to be null or None