Missing nil assertion
Merge branch 'feature/in_tail'