Updated error handling
Allow using unsegmented keys