new branch
add error handling and no found handling
add error handling and no found handling
merge feature