Add validation into goal to not be set 0 #606