Add check to catch error described in #65