Fix the specs and add exceptions