Added a data safeguard