Added error handling to client side;
Changed variable names to make it more clear;