Handle '' more gracefully