Fix Null Pointer Exception, #389, 394, Import Decl without literal string path, tests
Merge pull request #397 from josehsantos/fixes

Fix Null Pointer Exceptions, #389, 394, Import Decl