Include better exception handling and address issue #219