New error message - just like android's

Also some cleaning up here and there.