Updated samport controller checks