Add basic error handling
Try PyPy