Fix to pass either an array or null.