Added guard for nil param values for attributes