Adding a null changes check

Change-Id: I6d5bc3c9cbe0661997fa1c2816019110b66e4b53