Bugfix: handle missing related files better