fix the null pointer exception....