Avoid null Point(er)
Updated to Etyllica 3.3