Removed a non-working safety net in code. Will replace with better one later, perhaps.