fix message check & update changelog

uploadcare · Sep 5, 2018 · a984d5a · a984d5a
1 parent 12e151d
commit a984d5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/HISTORY.markdown b/HISTORY.markdown
@@ -7,8 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
 
+* Fixed error `Cannot read property 'type' of null` that often occurs together
+  with the grecaptcha2. See issue [#500][github-issue-500].
 
+[github-issue-500]: https://github.com/uploadcare/uploadcare-widget/issues/500
 [Unreleased]: https://github.com/uploadcare/uploadcare-widget/compare/v3.6.0...HEAD
 
 ## [3.6.0] - 2018-07-26

diff --git a/app/assets/javascripts/uploadcare/utils/messages.coffee b/app/assets/javascripts/uploadcare/utils/messages.coffee
@@ -12,7 +12,7 @@ uploadcare.namespace 'utils', (ns) ->
     catch
       return
 
-    if message.type of callbacks
+    if message?.type and message.type of callbacks
       for item in callbacks[message.type]
         if e.source == item[0]
           item[1](message)