changed naming rule
error message handing