Handle error nicely
Fix status change