Pull request for Issue665

@dretrex 
@davidChevrier 
This should also be error mon'ed.