changed catch cases
sync