Forgot some null checks, woops.