Additional diagnostics

See http://stackoverflow.com/questions/22417228 for the reason this isn't working.