remove fail safe logic
fail safe logic changed to Try block