Additional safety check