Fixes #50.
Fixes #51.
Merge pull request #53 from frmwrk123/fix/fatalError

Fixed fatal errors