uping to 0.7.0
more error handling