increased version and fixed one last null pointer