Improve a type error + TODO
Merge pull request #71 from Blaisorblade/topic/errors

Improve a type error + TODO