prevent crash until save Options works

Change-Id: I6efe24c279f0b08e88249411aaf3dc8166f6133c