Added a safety check in place