Fix checkstyle warnings of "Type NoneFound"
Fixed Type NoneFound