Added case for "None" to remove compiler warning