fixed Exception(s), regexp, tested flow