added error throwing on server side
merge