NM: Add better error. Let's see if this gets fixed.