Added catchByReference check