Defensive programming to reduce exceptions plus version bump