Thanks Toxxyc, thats my interpretation also. When I phoned CFR again this morning and told them this is the situation the person on the other side said that i can hand it in while the amnesty is still on or give it to the SAPS to keep till my license is sorted out.
I told him that's the last thing I want to do and his reply was then he does not know what I should do. According to him the firearm will be illegal if the license is not up to date.