Adding force close

Change-Id: Ib469df1e34adcc6a53e20e2ce135adab41c8022d