Added michelle's change to handle null pointer exception