check rest of single statements
Wrap troublesome name finder in try-catch to add context