Bugfix: handle unknown locations