Fix NRE (issue 17)