Double check for null for tones

Must fix #80