Fixed Command exception that was causing excessive loops with rmt_storage.