Fix for module options null ref.
Merge branch 'hotfix/1.3.2'