Fix 1429. Check for null dragger before dereferencing.

This fixes the possible null dereference described: #1429 (closed)

Also some minor style guide violations in the same function.