Modified code to avoid Null pointer exc