added error handling retur