Close #18

Fixed NPE due to changes of the html page.