Fixed nonterminating analysis and some return values