Added additional check for server variables