I think this needs to check if lat_dim/lon_dim are None before removing dimensions. Should be relatively simple. Needs a test too though as you say, I'll take care of this.