Merge remote-tracking branch 'adambard/master'

Conflicts:
	java.html.markdown

1 files changed, 36 insertions, 1 deletions

diff --git a/php.html.markdown b/php.html.markdown
index 2b1fe1dc..39ec5aef 100644
--- a/php.html.markdown
+++ b/php.html.markdown
@@ -693,8 +693,43 @@ use My\Namespace as SomeOtherNamespace;
 
 $cls = new SomeOtherNamespace\MyClass();
 
+/**********************
+*  Error Handling
+*  
 */
 
+// Simple error handling can be done with try catch block
+
+try {
+    // Do something
+} catch ( Exception $e) {
+    // Handle exception
+}
+
+// When using try catch blocks in a namespaced enviroment use the following
+
+try { 
+    // Do something
+} catch (\Exception $e) { 
+    // Handle exception
+}
+
+// Custom exceptions
+
+class MyException extends Exception {}
+
+try {
+    
+    $condition = true; 
+    
+    if ($condition) {
+        throw new MyException('Something just happend');
+    }
+    
+} catch (MyException $e) {
+    // Handle my exception
+}
+
 ```
 
 ## More Information
@@ -709,4 +744,4 @@ If you're coming from a language with good package management, check out
 [Composer](http://getcomposer.org/).
 
 For common standards, visit the PHP Framework Interoperability Group's
-[PSR standards](https://github.com/php-fig/fig-standards).
\ No newline at end of file
+[PSR standards](https://github.com/php-fig/fig-standards).