Improve null FK handling