Closes #42.
Updated exception message.
Fixed #60.
Merge branch 'master' into feature-load-with