Add extra check if relation actually exists.
Merge branch 'extended-orderby' into vlak