Fixed bug where discontinued would never be NULL.