Fixes #31

currData most not be null or undefined