Fetch protobuf if check fails

Review 894 by @tryneus
Closes #990