Fix issues with links if nil