Fix some quotes and error case