Ugh, I hate errors

Change-Id: Ia0cea13b9271a579425bb118bd51e4ca87df013e