Fix for Issue #379 (better name-checking when adding new terminations)