Fix #1 "IllegalArgumentException: key can't be empty"