Added an error prevention clause