fixed return stmts
updated exception.s