#10: Fixed angular js exceptions