Issue #723: Disallow double entry from terms that come from alt IDs
Fixed two possbile NPEs (freehand terms and not-yet saved properties).
Better codestyle.