Add some exception handling
Separate two errors