SWITCHYARD-1765 Added check for null reply handler