Fix NPE + Regex