Fixed null sender exception