Merge pull request #114 from amazur31/throw-error-for-null-factory

Merge pull request #114 from amazur31/throw-error-for-null-factory #99