Added more safety.
Merge pull request #78 from AshFurrow/safety-dance

@1aurarown => Added more safety.