improved currency errors handling