check for null when mapping for embedded assets