This map might be derefenced in further code, it's better to initialize it
Test returning null for classes which cannot be instantiated
Cease production, if instantiation failed
Merge pull request #38 from daivanov/master

Fix NullPointerException reported in Issue #37