Merge pull request #419 in ZP/z-push from bugfix/ZP-1096-checkmapiextversion-throws-warnings to develop

* commit '1c91cd2e':
  ZP-1096 Check for mapi externsion first and fail early.