[BUGFIX] Handle missing relations gracefully