tweak last pull request to prevent exception