MonoGame — pull request #1811 by totallyeviljake (2013-06-21 22:21:21+00:00)
Title: Update of PR 1603

I added @CartBlanche changes and added a check on a null reference that always seemed to happen when I ran my tests on PSM.