Better error handling
Some quick debugging stuff