Re-added try/catch