fixed null bug for first time users