Add in lambda filtered catches for when's promises