Improved safety checks to run every time