Add fix to catch exception