Issues/1937 Jetpack Link Crash

Fixes #1937 

Ready for review!

/cc @sendhil + @koke + @aerych