Adding handling so that missing callouts will not break entire build