Added additional case when ResultNotFoundException is returned.