Fix #1019 by adding NPE Deep Link

![image](https://cloud.githubusercontent.com/assets/7574/2758318/cbfbc9ee-c98f-11e3-8be1-8d0913337d95.png)

Fixes #1019 

Based on original contribution by @robertmuehsig in PR #2064