Added exception for more descriptive errors