added some extra checking to avoid errors.
Merge branch '7.x-4.x-springboard_p2p' of github.com:JacksonRiver/springboard_modules into 7.x-4.x-springboard_p2p