We usually use a NullPointerException here, so I think we should change this to make it consistent with the rest of our code base.