Added a trap and fixed SMP issues.