Arjen fix sentry bugs

### Issue
Sentry bugs

### Fix
Fix bugs. Mostly 'cannot read property X of 'undefined''.