Restored toplevel exception handling, fixed bug in site kick causing crash