Redundant nullcheck we weirdly need.
Properly handle exception
Merge branch 'master' of github.com:squell/ecalogic