Does the company you work for have a branch office in Doha? If they do, ask someone in HR or who ever handles their immigration if they can straighten out the issue or at least get answers for you. How did you get a visa? Try talking to the person who arranged a visa for you to see if they can help.

Not being a resident of Qatar most likely makes it even more difficult to straighten out such issues.

~I know nothing!~
Sergeant Schults from Hogan's Heros