Added some robustitude.