Better error handling. I hope