Issue #1613622 by Fabianx, Jeremy: Include as much of key bin and name as possible to aid in debugging, improve documentation