Put assertions in everywhere
Merge branch 'assertions-everywhere'