Fix literal value, error checking add and remove