Merge pull request #429 from josephschorr/max-size-error

Merge pull request #429 from josephschorr/max-size-error #85