Removed bare exception, added test