Adding execution safety checks in rawdata-procedures