Added todo
Added type of value to error messsage