GPSCAFFOLD-82 - Don't assume id is a Long

Does this look like the right thing to do?