Made catch more generic