Merge better error handling

Just a bit better error message: Now says in which line a yaml error happens.