Add errors for missing conditions

Hello @majelbstoat, 

Please review the following commits I made in branch 'nick-check'.

80d11f7c14ccf312e60a4aa4665c8396bedc73cb (2013-10-31 17:42:47 -0400)
Add errors for missing conditions

Check list:


R=@majelbstoat