Fixed patterns to work with "if"
Fixed success code
Possible solution for None args problem