Code style changes, throw an exception on the empty content