Fixes show-stopping exception

Fixes #2 also.