Bugfix when CCY field is NULL. Thanks to Claudio Ortelli