abelsilva fix to avoid exception when stopping