[TASK] Prevent fatal Exceptions for removed FAL references

Fixes: #117