Added additional parameter checks to savestate handling