Scanner errors are now handled properly. As everything though, it probably may be improved.