Fixed case for when to use org vs com

This resolves #1 
I've made the original exception clearer so this catch accept is less necessary but still helpful