Adding tryCatch and tryCatchDone helpers, adding more unit tests