Handling edge case with empty metadata - fixes #55