FIXED: issue with null sender address