So I wouldn't have changed it except that the test fails with JDK 11 due to that.

There's no point in mocking Map just to make it return null when we call get(null). Let's avoid that altogether.