Better error message
Close #96