Raise NotImplementedError properly
Merge branch 'misc' into tmp