improvement in exception handling
Same format for index.css on demo and master