Added a bit more diagnostics and removed git error