Remove "exceptions" and fix security