maybe we can ask @bevistseng to add the message to this specific error? It would make the code so simpler here :/