Add more assertions to BasicAdapter primitives
Merge pull request #865 from MikeAski/improve-assertions

Add more assertions to BasicAdapter primitives