Fixed NullPointerException by extending error check to also handle client side.
Merge pull request #267 from mattcr11/spark/clientcrash

Fixed NullPointerException
Dominant sparks stop draining newly upgraded sparks now.
Merge pull request #268 from mattcr11/spark/DomOP

Dominant sparks stop draining newly upgraded sparks now.