Null handling for remote deploy