Fully working

Null checker in main
Regex improved