Handles some undefined indexes
Styling
Merge complete
Closes socd-io/Deployment#160
Merge branch 'master' of github.com:socd-io/Activity