Handle nothing case better