added rescue instead of catch..