Small fixes

* Fix #1043
* Improve invalid tile error message