Bug fixes

try-catch everywhere :c