Comment correction
Changed 'Wait error' to something more English
Key Manager (complete)
Check for null return for Classes from manager