Added exception on invalid dealer and a few HTML error fixes