Little bit of whitespace gardening and check for "NO_VALUES" just in case users manage to trigger it again.