Solved error detection

Pushed on Feb 19th