Fix missing assertion and clean up calls

Linter caught a missing assertion and a missing clean up function call. This commit adds them in.

@johncai this should be small enough for one reviewer only