Merge pull request #1935 from Areloch/RecordingSafetyCheck