Filter out nulls - prevent NPE