Thought better of TODO
Removed no-op deletion of missing term
Simplified flow around begin/rescue/end