fixed null key exception