fixing null returning stuff