Added a safety check and TODO