Fix issue with errors being generated when no Key set for Track