Cleanup. Added exception method.