Better error handling / reporting
More debugging