added recover for specific exception
small fixes