Add error handling on get original