Added proper condition to signal errors
Removed unnecessary helper function
Work on CLOS wrapper put on hold until further notice