Fixed error by just returning null lol. TODO fix tests