Resolve security bug
Resolve uncaught exception