The current code looks up the screen geometry for a null screen which gives warnings before returning the same value.