Ignore null values
Fix access to properties