Make the error message slightly nicer
Make the error message slightly nicer
Fix a bug