Added some error checking for null change commands