Added just-in-case null check + version bump to 1.2.1