hopefully fix nullpointer, through web edit :)
Merge pull request #1 from redlab/webfix

hopefully fix nullpointer, through web edit :)