Safer checking on derivative creation.
Update comments.
Merge pull request #150 from jordandukart/7.x-safer-derivatives

Safer checking on derivative creation.