Fixed nill handling in ADD-SF.