Fixed rescue in core to fix crash