add new catch exception + remove hard code