SSP-1835 Special handling for null FA values