Updated pre-condition and safety check for fortify