Re-enabled try-catch to prevent outright crashing. A few minor changes.