only add topic if it's valid (account for no topic added)
fixed late_policy bug by adding a check before saving :)