Added extra error handling in get methods