Put opSucceeded call inside else block