Dropped deprecated constructor.
Added better broken input handling (empty fields, tokens).