Gah. NPE. Fail. fixes #120