change how to catch exception